From 6e67cfc7beb17e207c31a2b9d86aa184eb109fb2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 27 Apr 2024 12:26:34 +0300
Subject: [PATCH 001/400] Fixed possible crash in moderation box.

---
 .../boxes/moderate_messages_box.cpp           | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 0d1aa10a1c478..5f08f98e3c881 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -185,7 +185,6 @@ void CreateModerateMessagesBox(
 		rpl::event_stream<bool> checkAllRequests;
 		Fn<Users()> collectRequests;
 	};
-	constexpr auto kSmallDelayMs = 5;
 	const auto options = CalculateModerateOptions(items);
 	const auto inner = box->verticalLayout();
 
@@ -211,6 +210,7 @@ void CreateModerateMessagesBox(
 
 	using Request = Fn<void(not_null<UserData*>, not_null<ChannelData*>)>;
 	const auto sequentiallyRequest = [=](Request request, Users users) {
+		constexpr auto kSmallDelayMs = 5;
 		const auto session = &items.front()->history()->session();
 		const auto history = items.front()->history();
 		const auto peerId = history->peer->id;
@@ -243,14 +243,8 @@ void CreateModerateMessagesBox(
 			not_null<Controller*> controller,
 			Request request) {
 		confirms->events() | rpl::start_with_next([=] {
-			if (checkbox->checked()) {
-				if (isSingle) {
-					const auto item = items.front();
-					const auto channel = item->history()->peer->asChannel();
-					request(users.front(), channel);
-				} else if (const auto collect = controller->collectRequests) {
-					sequentiallyRequest(request, collect());
-				}
+			if (checkbox->checked() && controller->collectRequests) {
+				sequentiallyRequest(request, controller->collectRequests());
 			}
 		}, checkbox->lifetime());
 	};
@@ -345,6 +339,11 @@ void CreateModerateMessagesBox(
 	const auto appendList = [&](
 			not_null<Ui::Checkbox*> checkbox,
 			not_null<Controller*> controller) {
+		if (isSingle) {
+			const auto user = users.front();
+			controller->collectRequests = [=] { return Users{ user }; };
+			return;
+		}
 		const auto button = Ui::CreateChild<Button>(inner, users.size());
 		button->resize(Button::ComputeSize(users.size()));
 
@@ -399,9 +398,8 @@ void CreateModerateMessagesBox(
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
 		const auto controller = box->lifetime().make_state<Controller>();
-		if (!isSingle) {
-			appendList(report, controller);
-		}
+		appendList(report, controller);
+
 		const auto ids = items.front()->from()->owner().itemsToIds(items);
 		handleConfirmation(report, controller, [=](
 				not_null<UserData*> u,
@@ -444,9 +442,8 @@ void CreateModerateMessagesBox(
 			st::boxRowPadding + buttonPadding);
 
 		const auto controller = box->lifetime().make_state<Controller>();
-		if (!isSingle) {
-			appendList(deleteAll, controller);
-		}
+		appendList(deleteAll, controller);
+
 		handleConfirmation(deleteAll, controller, [=](
 				not_null<UserData*> u,
 				not_null<ChannelData*> c) {
@@ -474,9 +471,8 @@ void CreateModerateMessagesBox(
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
 		const auto controller = box->lifetime().make_state<Controller>();
-		if (!isSingle) {
-			appendList(ban, controller);
-		}
+		appendList(ban, controller);
+
 		Ui::AddSkip(inner);
 		Ui::AddSkip(inner);
 
@@ -629,7 +625,6 @@ void CreateModerateMessagesBox(
 	const auto close = crl::guard(box, [=] { box->closeBox(); });
 	box->addButton(tr::lng_box_delete(), [=] {
 		confirms->fire({});
-		box->closeBox();
 		const auto data = &users.front()->session().data();
 		const auto ids = data->itemsToIds(items);
 		if (confirmed) {

From e81465a54e828b40e76795487d229dad729c4b7d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 27 Apr 2024 13:31:00 +0300
Subject: [PATCH 002/400] Added Enter shortcut to moderation box for
 confirmation.

---
 .../boxes/moderate_messages_box.cpp           | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 5f08f98e3c881..ff34a8a45aed5 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "api/api_chat_participants.h"
 #include "apiwrap.h"
+#include "base/event_filter.h"
 #include "base/timer.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h"
@@ -25,6 +26,7 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/toggle_arrow.h"
@@ -249,6 +251,42 @@ void CreateModerateMessagesBox(
 		}, checkbox->lifetime());
 	};
 
+	const auto isEnter = [=](not_null<QEvent*> event) {
+		if (event->type() == QEvent::KeyPress) {
+			if (const auto k = static_cast<QKeyEvent*>(event.get())) {
+				return (k->key() == Qt::Key_Enter)
+					|| (k->key() == Qt::Key_Return);
+			}
+		}
+		return false;
+	};
+
+	base::install_event_filter(box, [=](not_null<QEvent*> event) {
+		if (isEnter(event)) {
+			box->triggerButton(0);
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	const auto handleSubmition = [=](not_null<Ui::Checkbox*> checkbox) {
+		base::install_event_filter(box, [=](not_null<QEvent*> event) {
+			if (!isEnter(event) || !checkbox->checked()) {
+				return base::EventFilterResult::Continue;
+			}
+			box->uiShow()->show(Ui::MakeConfirmBox({
+				.text = tr::lng_gigagroup_warning_title(),
+				.confirmed = [=](Fn<void()> close) {
+					box->triggerButton(0);
+					close();
+				},
+				.confirmText = tr::lng_box_yes(),
+				.cancelText = tr::lng_box_no(),
+			}));
+			return base::EventFilterResult::Cancel;
+		});
+	};
+
 	const auto createUsersList = [&](not_null<Controller*> controller) {
 		const auto wrap = inner->add(
 			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -399,6 +437,7 @@ void CreateModerateMessagesBox(
 			st::boxRowPadding + buttonPadding);
 		const auto controller = box->lifetime().make_state<Controller>();
 		appendList(report, controller);
+		handleSubmition(report);
 
 		const auto ids = items.front()->from()->owner().itemsToIds(items);
 		handleConfirmation(report, controller, [=](
@@ -443,6 +482,7 @@ void CreateModerateMessagesBox(
 
 		const auto controller = box->lifetime().make_state<Controller>();
 		appendList(deleteAll, controller);
+		handleSubmition(deleteAll);
 
 		handleConfirmation(deleteAll, controller, [=](
 				not_null<UserData*> u,
@@ -472,6 +512,7 @@ void CreateModerateMessagesBox(
 			st::boxRowPadding + buttonPadding);
 		const auto controller = box->lifetime().make_state<Controller>();
 		appendList(ban, controller);
+		handleSubmition(ban);
 
 		Ui::AddSkip(inner);
 		Ui::AddSkip(inner);

From e0db0642bda6d9ece8e0ddfa94a28e39afc96468 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 27 Apr 2024 16:39:13 +0300
Subject: [PATCH 003/400] Fixed crash when deleting message from non-user.

---
 .../boxes/moderate_messages_box.cpp           | 60 +++++++++----------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index ff34a8a45aed5..19032bcc2e21e 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -43,36 +43,43 @@ For license and copyright information please follow this link:
 
 namespace {
 
-enum class ModerateOption {
-	Ban = (1 << 0),
-	DeleteAll = (1 << 1),
+using Users = std::vector<not_null<UserData*>>;
+
+struct ModerateOptions final {
+	bool allCanBan = false;
+	bool allCanDelete = false;
+	Users users;
 };
-inline constexpr bool is_flag_type(ModerateOption) { return true; }
-using ModerateOptions = base::flags<ModerateOption>;
 
 ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
 	Expects(!items.empty());
 
+	auto result = ModerateOptions{
+		.allCanBan = true,
+		.allCanDelete = true,
+	};
+
 	const auto peer = items.front()->history()->peer;
-	auto allCanBan = true;
-	auto allCanDelete = true;
 	for (const auto &item : items) {
-		if (!allCanBan && !allCanDelete) {
-			return ModerateOptions(0);
+		if (!result.allCanBan && !result.allCanDelete) {
+			return {};
 		}
 		if (peer != item->history()->peer) {
-			return ModerateOptions(0);
+			return {};
 		}
 		if (!item->suggestBanReport()) {
-			allCanBan = false;
+			result.allCanBan = false;
 		}
 		if (!item->suggestDeleteAllReport()) {
-			allCanDelete = false;
+			result.allCanDelete = false;
+		}
+		if (const auto user = item->from()->asUser()) {
+			if (!ranges::contains(result.users, not_null{ user })) {
+				result.users.push_back(user);
+			}
 		}
 	}
-	return ModerateOptions(0)
-		| (allCanBan ? ModerateOption::Ban : ModerateOptions(0))
-		| (allCanDelete ? ModerateOption::DeleteAll : ModerateOptions(0));
+	return result;
 }
 
 class Button final : public Ui::RippleButton {
@@ -180,27 +187,16 @@ void CreateModerateMessagesBox(
 		not_null<Ui::GenericBox*> box,
 		const HistoryItemsList &items,
 		Fn<void()> confirmed) {
-	using Users = std::vector<not_null<UserData*>>;
 	struct Controller final {
 		rpl::event_stream<bool> toggleRequestsFromTop;
 		rpl::event_stream<bool> toggleRequestsFromInner;
 		rpl::event_stream<bool> checkAllRequests;
 		Fn<Users()> collectRequests;
 	};
-	const auto options = CalculateModerateOptions(items);
+	const auto [allCanBan, allCanDelete, users] = CalculateModerateOptions(
+		items);
 	const auto inner = box->verticalLayout();
 
-	const auto users = [&] {
-		auto result = Users();
-		for (const auto &item : items) {
-			if (const auto user = item->from()->asUser()) {
-				if (!ranges::contains(result, not_null{ user })) {
-					result.push_back(user);
-				}
-			}
-		}
-		return result;
-	}();
 	Assert(!users.empty());
 
 	const auto confirms = inner->lifetime().make_state<rpl::event_stream<>>();
@@ -460,7 +456,7 @@ void CreateModerateMessagesBox(
 		});
 	}
 
-	if (options & ModerateOption::DeleteAll) {
+	if (allCanDelete) {
 		Ui::AddSkip(inner);
 		Ui::AddSkip(inner);
 
@@ -490,7 +486,7 @@ void CreateModerateMessagesBox(
 			u->session().api().deleteAllFromParticipant(c, u);
 		});
 	}
-	if (options & ModerateOption::Ban) {
+	if (allCanBan) {
 		auto ownedWrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			inner,
 			object_ptr<Ui::VerticalLayout>(inner));
@@ -680,6 +676,6 @@ void CreateModerateMessagesBox(
 
 bool CanCreateModerateMessagesBox(const HistoryItemsList &items) {
 	const auto options = CalculateModerateOptions(items);
-	return (options & ModerateOption::Ban)
-		|| (options & ModerateOption::DeleteAll);
+	return (options.allCanBan || options.allCanDelete)
+		&& !options.users.empty();
 }

From b8b02b2285cc4fab65ebca245e651e8bdd43ed6e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 28 Apr 2024 13:33:04 +0300
Subject: [PATCH 004/400] Replaced list of history items for sending now with
 sorted by date.

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

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index f3749d62292d7..f6473b07b360c 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2281,7 +2281,9 @@ QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
 	](Fn<void()> &&close) {
 		close();
 		auto ids = QVector<MTPint>();
-		for (const auto item : session->data().idsToItems(list)) {
+		auto sorted = session->data().idsToItems(list);
+		ranges::sort(sorted, ranges::less(), &HistoryItem::date);
+		for (const auto &item : sorted) {
 			if (item->allowsSendNow()) {
 				ids.push_back(
 					MTP_int(session->scheduledMessages().lookupId(item)));

From be255f1d0949b199c2f4685b816cc768a62f35b1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 28 Apr 2024 14:25:04 +0300
Subject: [PATCH 005/400] Added to moderate box number of all messages that
 will be deleted.

---
 .../boxes/moderate_messages_box.cpp           | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 19032bcc2e21e..61464e2f965ad 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "boxes/moderate_messages_box.h"
 
 #include "api/api_chat_participants.h"
+#include "api/api_messages_search.h"
 #include "apiwrap.h"
 #include "base/event_filter.h"
 #include "base/timer.h"
@@ -82,6 +83,24 @@ ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
 	return result;
 }
 
+[[nodiscard]] rpl::producer<int> MessagesCountValue(
+		not_null<History*> history,
+		not_null<PeerData*> from) {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+		auto search = lifetime.make_state<Api::MessagesSearch>(history);
+		consumer.put_next(0);
+
+		search->messagesFounds(
+		) | rpl::start_with_next([=](const Api::FoundMessages &found) {
+			consumer.put_next_copy(found.total);
+		}, lifetime);
+		search->searchMessages({ .from = from });
+
+		return lifetime;
+	};
+}
+
 class Button final : public Ui::RippleButton {
 public:
 	Button(not_null<QWidget*> parent, int count);
@@ -411,7 +430,7 @@ void CreateModerateMessagesBox(
 	};
 
 	Ui::AddSkip(inner);
-	box->addRow(
+	const auto title = box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			(items.size() == 1)
@@ -475,6 +494,22 @@ void CreateModerateMessagesBox(
 				false,
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
+		if (isSingle) {
+			const auto history = items.front()->history();
+			tr::lng_selected_delete_sure(
+				lt_count,
+				rpl::combine(
+					MessagesCountValue(history, users.front()),
+					deleteAll->checkedValue()
+				) | rpl::map([s = items.size()](int all, bool checked) {
+					return float64((checked && all) ? all : s);
+				})
+			) | rpl::start_with_next([=](const QString &text) {
+				title->setText(text);
+				title->resizeToWidth(inner->width()
+					- rect::m::sum::h(st::boxRowPadding));
+			}, title->lifetime());
+		}
 
 		const auto controller = box->lifetime().make_state<Controller>();
 		appendList(deleteAll, controller);

From 62bd1354dcc53404165e7fac6e970e1189bd9575 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 28 Apr 2024 16:38:37 +0300
Subject: [PATCH 006/400] Replaced box for leaving or deleting chat with
 generic box.

---
 .../SourceFiles/boxes/delete_messages_box.cpp |   8 +-
 .../boxes/moderate_messages_box.cpp           | 128 ++++++++++++++++++
 .../SourceFiles/boxes/moderate_messages_box.h |   3 +
 .../SourceFiles/window/window_peer_menu.cpp   |   5 +-
 4 files changed, 134 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
index 1def53870bb58..247cad699a410 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
@@ -379,13 +379,7 @@ auto DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const
 		return result;
 	}
 
-	const auto items = ranges::views::all(
-		_ids
-	) | ranges::views::transform([&](FullMsgId id) {
-		return peer->owner().message(id);
-	}) | ranges::views::filter([](HistoryItem *item) {
-		return (item != nullptr);
-	}) | ranges::to_vector;
+	const auto items = peer->owner().idsToItems(_ids);
 
 	if (items.size() != _ids.size()) {
 		// We don't have information about all messages.
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 61464e2f965ad..e6079a0b72c83 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -14,6 +14,7 @@ For license and copyright information please follow this link:
 #include "base/timer.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h"
+#include "core/application.h"
 #include "core/ui_integration.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
@@ -41,6 +42,7 @@ For license and copyright information please follow this link:
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
+#include "styles/style_window.h"
 
 namespace {
 
@@ -714,3 +716,129 @@ bool CanCreateModerateMessagesBox(const HistoryItemsList &items) {
 	return (options.allCanBan || options.allCanDelete)
 		&& !options.users.empty();
 }
+
+void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
+	const auto container = box->verticalLayout();
+
+	const auto maybeUser = peer->asUser();
+
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+
+	base::install_event_filter(box, [=](not_null<QEvent*> event) {
+		if (event->type() == QEvent::KeyPress) {
+			if (const auto k = static_cast<QKeyEvent*>(event.get())) {
+				if ((k->key() == Qt::Key_Enter)
+					|| (k->key() == Qt::Key_Return)) {
+					box->uiShow()->show(Ui::MakeConfirmBox({
+						.text = tr::lng_gigagroup_warning_title(),
+						.confirmed = [=](Fn<void()> close) {
+							box->triggerButton(0);
+							close();
+						},
+						.confirmText = tr::lng_box_yes(),
+						.cancelText = tr::lng_box_no(),
+					}));
+				}
+			}
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	const auto line = container->add(object_ptr<Ui::RpWidget>(container));
+	const auto &st = st::mainMenuUserpic;
+	line->resize(line->width(), st.size.height());
+
+	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+		line,
+		peer,
+		st);
+	userpic->showSavedMessagesOnSelf(true);
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		line,
+		peer->isSelf()
+			? tr::lng_saved_messages() | rpl::map(Ui::Text::Bold)
+			: maybeUser
+			? tr::lng_profile_delete_conversation() | rpl::map(Ui::Text::Bold)
+			: rpl::single(Ui::Text::Bold(peer->name())),
+		box->getDelegate()->style().title);
+	line->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		userpic->moveToLeft(st::boxRowPadding.left(), 0);
+		const auto skip = st::defaultBoxCheckbox.textPosition.x();
+		label->resizeToWidth(width
+			- rect::right(userpic)
+			- skip
+			- st::boxRowPadding.right());
+		label->moveToLeft(
+			rect::right(userpic) + skip,
+			((userpic->height() - label->height()) / 2));
+	}, label->lifetime());
+
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			container,
+			peer->isSelf()
+				? tr::lng_sure_delete_saved_messages()
+				: maybeUser
+				? tr::lng_sure_delete_history(
+					lt_contact,
+					rpl::single(peer->name()))
+				: (peer->isChannel() && !peer->isMegagroup())
+				? tr::lng_sure_leave_channel()
+				: tr::lng_sure_leave_group(),
+			st::boxLabel));
+
+	const auto maybeCheckbox = [&]() -> Ui::Checkbox* {
+		if (!peer->canRevokeFullHistory()) {
+			return nullptr;
+		}
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		return box->addRow(
+			object_ptr<Ui::Checkbox>(
+				container,
+				maybeUser
+					? tr::lng_delete_for_other_check(
+						tr::now,
+						lt_user,
+						TextWithEntities{ maybeUser->firstName },
+						Ui::Text::RichLangValue)
+					: tr::lng_delete_for_everyone_check(
+						tr::now,
+						Ui::Text::WithEntities),
+				false,
+				st::defaultBoxCheckbox));
+	}();
+
+	Ui::AddSkip(container);
+
+	auto buttonText = maybeUser
+		? tr::lng_box_delete()
+		: !maybeCheckbox
+		? tr::lng_box_leave()
+		: maybeCheckbox->checkedValue() | rpl::map([](bool checked) {
+			return checked ? tr::lng_box_delete() : tr::lng_box_leave();
+		}) | rpl::flatten_latest();
+
+	const auto close = crl::guard(box, [=] { box->closeBox(); });
+	box->addButton(std::move(buttonText), [=] {
+		const auto revoke = maybeCheckbox && maybeCheckbox->checked();
+		Core::App().closeChatFromWindows(peer);
+		// Don't delete old history by default,
+		// because Android app doesn't.
+		//
+		//if (const auto from = peer->migrateFrom()) {
+		//	peer->session().api().deleteConversation(from, false);
+		//}
+		peer->session().api().deleteConversation(peer, revoke);
+		close();
+	}, st::attentionBoxButton);
+	box->addButton(tr::lng_cancel(), close);
+}
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.h b/Telegram/SourceFiles/boxes/moderate_messages_box.h
index 351b49741bfcc..eb240261259c6 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.h
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+class PeerData;
 
 namespace Ui {
 class GenericBox;
@@ -18,3 +19,5 @@ void CreateModerateMessagesBox(
 	Fn<void()> confirmed);
 
 [[nodiscard]] bool CanCreateModerateMessagesBox(const HistoryItemsList &);
+
+void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer);
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index f6473b07b360c..7648e4543b12b 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -22,6 +22,7 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/max_invite_box.h"
+#include "boxes/moderate_messages_box.h"
 #include "boxes/choose_filter_box.h"
 #include "boxes/create_poll_box.h"
 #include "boxes/pin_messages_box.h"
@@ -2549,9 +2550,7 @@ Fn<void()> ClearHistoryHandler(
 Fn<void()> DeleteAndLeaveHandler(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer) {
-	return [=] {
-		controller->show(Box<DeleteMessagesBox>(peer, false));
-	};
+	return [=] { controller->show(Box(DeleteChatBox, peer)); };
 }
 
 void FillDialogsEntryMenu(

From 2f0aa6ef05f6c3657e22e6ee675387ba9a80b0db Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 30 Apr 2024 16:49:17 +0300
Subject: [PATCH 007/400] Removed state sending of low level of battery to call
 participant.

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

diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 3a3e68b475fe7..527839363b0be 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -7,31 +7,29 @@ For license and copyright information please follow this link:
 */
 #include "calls/calls_call.h"
 
-#include "main/main_session.h"
-#include "main/main_account.h"
-#include "main/main_app_config.h"
 #include "apiwrap.h"
-#include "lang/lang_keys.h"
-#include "boxes/abstract_box.h"
-#include "ui/boxes/confirm_box.h"
-#include "ui/boxes/rate_call_box.h"
-#include "calls/calls_instance.h"
-#include "base/battery_saving.h"
 #include "base/openssl_help.h"
+#include "base/platform/base_platform_info.h"
 #include "base/random.h"
-#include "mtproto/mtproto_dh_utils.h"
-#include "mtproto/mtproto_config.h"
+#include "boxes/abstract_box.h"
+#include "calls/calls_instance.h"
+#include "calls/calls_panel.h"
 #include "core/application.h"
 #include "core/core_settings.h"
-#include "window/window_controller.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
 #include "media/audio/media_audio_track.h"
-#include "base/platform/base_platform_info.h"
-#include "calls/calls_panel.h"
+#include "mtproto/mtproto_config.h"
+#include "mtproto/mtproto_dh_utils.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/rate_call_box.h"
+#include "webrtc/webrtc_create_adm.h"
 #include "webrtc/webrtc_environment.h"
 #include "webrtc/webrtc_video_track.h"
-#include "webrtc/webrtc_create_adm.h"
-#include "data/data_user.h"
-#include "data/data_session.h"
+#include "window/window_controller.h"
 
 #include <tgcalls/Instance.h>
 #include <tgcalls/VideoCaptureInterface.h>
@@ -1072,6 +1070,7 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 		Core::App().mediaDevices().setCaptureMuted(muted);
 	}, _instanceLifetime);
 
+#if 0
 	Core::App().batterySaving().value(
 	) | rpl::start_with_next([=](bool isSaving) {
 		crl::on_main(weak, [=] {
@@ -1080,6 +1079,7 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 			}
 		});
 	}, _instanceLifetime);
+#endif
 }
 
 void Call::handleControllerStateChange(tgcalls::State state) {

From 20a13663a6c3830b5106affe9061b051cfa713e3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 30 Apr 2024 17:35:04 +0300
Subject: [PATCH 008/400] Slightly improved style of rpl text mapping.

---
 Telegram/SourceFiles/boxes/moderate_messages_box.cpp         | 4 ++--
 Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp | 2 +-
 Telegram/SourceFiles/settings/settings_business.cpp          | 2 +-
 Telegram/SourceFiles/settings/settings_premium.cpp           | 4 ++--
 Telegram/SourceFiles/ui/effects/premium_graphics.cpp         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index e6079a0b72c83..4496ed421a07a 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -757,9 +757,9 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		line,
 		peer->isSelf()
-			? tr::lng_saved_messages() | rpl::map(Ui::Text::Bold)
+			? tr::lng_saved_messages() | Ui::Text::ToBold()
 			: maybeUser
-			? tr::lng_profile_delete_conversation() | rpl::map(Ui::Text::Bold)
+			? tr::lng_profile_delete_conversation() | Ui::Text::ToBold()
 			: rpl::single(Ui::Text::Bold(peer->name())),
 		box->getDelegate()->style().title);
 	line->widthValue(
diff --git a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
index f2445a1668f60..d2e2e945eca8e 100644
--- a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
@@ -224,7 +224,7 @@ PreviewWrap::PreviewWrap(
 					lt_user,
 					rpl::single(
 						item->history()->peer->shortName()
-					) | rpl::map(Ui::Text::RichLangValue),
+					) | Ui::Text::ToRichLangValue(),
 					Ui::Text::RichLangValue)
 			: (isRound
 				? tr::lng_ttl_round_tooltip_in
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index c11a0f3cddad9..66b707c5fcc14 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -185,7 +185,7 @@ void AddBusinessSummary(
 		const auto label = content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
-				std::move(entry.title) | rpl::map(Ui::Text::Bold),
+				std::move(entry.title) | Ui::Text::ToBold(),
 				stLabel),
 			titlePadding);
 		label->setAttribute(Qt::WA_TransparentForMouseEvents);
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 601f1f978fa80..057f36d2d9973 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -986,7 +986,7 @@ void Premium::setupContent() {
 		object_ptr<Ui::FlatLabel>(
 			content,
 			tr::lng_premium_summary_bottom_subtitle(
-			) | rpl::map(Ui::Text::Bold),
+			) | Ui::Text::ToBold(),
 			stLabel),
 		st::defaultSubsectionTitlePadding);
 	content->add(
@@ -1630,7 +1630,7 @@ void AddSummaryPremium(
 		const auto label = content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
-				std::move(entry.title) | rpl::map(Ui::Text::Bold),
+				std::move(entry.title) | Ui::Text::ToBold(),
 				stLabel),
 			titlePadding);
 		label->setAttribute(Qt::WA_TransparentForMouseEvents);
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index 3d3cb00ef9d33..b701f8500034b 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -1199,7 +1199,7 @@ void ShowListBox(
 		const auto title = content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
-				base::take(entry.title) | rpl::map(Ui::Text::Bold),
+				base::take(entry.title) | Ui::Text::ToBold(),
 				stLabel),
 			entry.icon ? iconTitlePadding : titlePadding);
 		content->add(

From ef8c07e6eb0f44ca634f817e30351a39a33720fe Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 30 Apr 2024 17:35:34 +0300
Subject: [PATCH 009/400] Added ability to translate selected text in profile
 section.

---
 .../SourceFiles/info/profile/info_profile_actions.cpp | 11 +++++++++--
 Telegram/lib_ui                                       |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index c4ba6889962b2..b7a14b484b237 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -965,13 +965,20 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			if (Ui::SkipTranslate(state->labelText.current())) {
 				return;
 			}
-			auto item = tr::lng_context_translate(tr::now);
+			auto item = (request.selection.empty()
+				? tr::lng_context_translate
+				: tr::lng_context_translate_selected)(tr::now);
 			request.menu->addAction(std::move(item), [=] {
 				controller->window().show(Box(
 					Ui::TranslateBox,
 					peer,
 					MsgId(),
-					state->labelText.current(),
+					request.selection.empty()
+						? state->labelText.current()
+						: Ui::Text::Mid(
+							state->labelText.current(),
+							request.selection.from,
+							request.selection.to - request.selection.from),
 					false));
 			});
 		});
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index cb57bef3f01b7..08b56a17892d4 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit cb57bef3f01b7ec60eb0eae0ee68cd56cb3a9b1f
+Subproject commit 08b56a17892d4c9c6b7ef87fcffbb64090e9ce2a

From b9b7d9e33709daec348c51e81607e47c56d6e3bc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 Apr 2024 14:58:32 +0400
Subject: [PATCH 010/400] Implement live location view.

---
 .../icons/chat/live_location_long.png         | Bin 0 -> 416 bytes
 .../icons/chat/live_location_long@2x.png      | Bin 0 -> 913 bytes
 .../icons/chat/live_location_long@3x.png      | Bin 0 -> 1588 bytes
 Telegram/Resources/langs/lang.strings         |   9 +
 .../SourceFiles/data/data_media_types.cpp     |  51 ++-
 Telegram/SourceFiles/data/data_media_types.h  |  18 +-
 Telegram/SourceFiles/history/history_item.cpp |   4 +-
 .../view/media/history_view_location.cpp      | 407 ++++++++++++++++--
 .../view/media/history_view_location.h        |  33 +-
 .../history/view/media/history_view_media.cpp |   4 +
 .../history/view/media/history_view_media.h   |   1 +
 Telegram/SourceFiles/ui/chat/chat.style       |   6 +
 Telegram/SourceFiles/ui/chat/chat_style.cpp   |   6 +
 Telegram/SourceFiles/ui/chat/chat_style.h     |   1 +
 Telegram/build/prepare/prepare.py             |  76 +++-
 15 files changed, 554 insertions(+), 62 deletions(-)
 create mode 100644 Telegram/Resources/icons/chat/live_location_long.png
 create mode 100644 Telegram/Resources/icons/chat/live_location_long@2x.png
 create mode 100644 Telegram/Resources/icons/chat/live_location_long@3x.png

diff --git a/Telegram/Resources/icons/chat/live_location_long.png b/Telegram/Resources/icons/chat/live_location_long.png
new file mode 100644
index 0000000000000000000000000000000000000000..847930f549c6a70c90798213cbfdc6becb5414f6
GIT binary patch
literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000~S000~a0ssI2{clLa00009a7bBm000XU
z000XU0RWnu7ytkPQb|NXR7i>Kk-zFeVHkkl4mpwhD`tbFT!3US%YbWe0jHGgR;3hK
zT!f8HXCadO36nC|+<=_)7{2-?2FLt6&-OljJ>Ofeh=YT}2b!k&{r*qycDsE(-_JQ+
z*W2y(?REpk<8eNp*ECH;qS0u--?uCa7!HT2RO*KX=kqymxm;GO6#$4xC=|M0ufX|y
z-fT9&{eDj*61Jj-VE~;@M~#(ArCzU#$bP>Es@1CUrBVr)&1SZu>-Ac#_DZkU1Deg|
zt29j$2#3SpqucHFEt<>afWzVN_Hr_r0Fg-Kd$d-o0j*X`jhRg5@pu5SSgc$wHyRD)
zi^U?aSS-F5Ma1QDEtgB+bUIC^Q+239p&%l=-3~Y&kLr?^WhIkITTv0wb-ml|ss&Bc
z%x1I7$K&zAV4%JkjYjEo+HUa=kH-@X20y*m>kR|~Kj$1A{sB+<w7b<9L_kLX0000<
KMNUMnLSTYS?!6lT

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/live_location_long@2x.png b/Telegram/Resources/icons/chat/live_location_long@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4c0182008a996804ac48b4c201e86fc628f551f
GIT binary patch
literal 913
zcmV;C18)3@P)<h;3K|Lk000e1NJLTq001}u001}$0ssI2C*-V200009a7bBm000XU
z000XU0RWnu7ytkRLrFwIRA_<imO&^yQ5?s|Y`curOe7^a7)C5@q2{92$+}Pu4pNkw
zlqm<<rJS~i8wUr{W@C3L%E7@ZCwr1DrQNimrnIpvk~MZx)B7J@|M%Z4V{G$xdY{wm
z+t2)d-`?)~%@70zgTY`h7z_r3!TdU=yzeY7E@l`;RaI40_4qVRmz0#ezrO<j@@Q9(
z$321|baZqyG&ImOeSd!+i^X<#cMlH_Kb5Uks~`wG&)aM^ilP#UL^K-p`~9b<r+Kv2
zOLup7BoYBRsH(cZzu(&0`oR}PF&>ZS`Y$gpUayy7nE#Tpv$Io{<=n1_+uPfwrY7Xi
z&(CYf0Dw>^WVKoiPRViH<KrXhadL7pH#g^UxmH(KB}qd2R99CA{e^{v>`X^TN3*lD
zZnxX#^QBTLwC?x&4Gy}ov4N`3%*<r(M0Iub_VzXaU~Fs*t_%$gAz7B?{{DWG>EEff
z+wB(@7f5JtZ#OI@%d(kFMq>{sit6d<u~;kwLA12AD2f8*o12?YbJWz-B$G+#_<TOY
zg7)?G!J?T=hT}MG`S|!4?bhJn;8&W*<AF{j5}|3@n4nWrQ>du6IXO9rQU(G64b$m#
zLQRsS=H}*aGmv_M78K|jw>F#2<MF`jySuyb@o^0q{2luwNs{FEF?0o$Bnd@fS@u)M
zWHPO-tx*&OKMoHMr&1}6nmo_Li-(7Y>+5ShF}|m^wicZauh*L^kR-XZw3Pd!^E}_x
z)s^d4RaGSt2`I0xuN#vRvbnj5a=6{@>_0<gWo0lJMBkpBofQ=o5d^_73_RKc0|VKm
zIF5_OV#s$m97YChY-~)Y)2Mnl9G;$@76f5&aq;Tv3azKpX*3pAR#wpZ!NI}A#Kg$R
z$nx?s8cYCyt*tF1Q$n0h=iA#G_?mb;-qzNJe3#3mAp-zHp^#yN=>xsJz0qj&tFCst
z{ev%xB6`4PqbN!s5GXAz)!+KZuXz@WWps4Z;c(Q~*B2HRK0Q5MUS96(?CkCBed?E&
zmy4pv^E}J4X0th&OrD>g2ZO<IIQ*l&`Mi%p%F4>jX0t5IudlCq{ECVSk|dv>pA|*P
nyD0{P!C){L3<iV2{3?F{foZu_t%C1000000NkvXXu0mjfp}n~Z

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/live_location_long@3x.png b/Telegram/Resources/icons/chat/live_location_long@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a8cd36b53d105ad14199abfbe61d56ff057b0c8
GIT binary patch
literal 1588
zcmV-42Fv-0P)<h;3K|Lk000e1NJLTq002|~002}70ssI2lL?2G00009a7bBm000XU
z000XU0RWnu7ytkT=1D|BRCt{2*<nZ;eHZ|6U-MSB!!<)B93peA*_zab$Rc7e#;{2g
zu@6GTMvDzU3?xR-hnOE?5L+_((1#5N8$pcN*rNKNB1My7*uYgb*=nI!gsw96oR_%|
z!o7b^(=)BTFFe0b-T8l>d!FvR``=#{3jhEB0000000000000000055JKSz<2!{L;c
zmSPx|NF>7H@bBNh51r@q>C^lB`y@#c1VNHyVe2ep^FpDpwzjsqx>})72!+B^r%uIU
zvDMX8r_;H(xae>=*4NjW<dH}ub#-;;&!4ZUsgX*hCr+H$-rn|jJacn%3kwVL^Yful
zsDNb`z}2f)hlhuKK3^gouh(ld8k?J&IUG)gBsh+@wY9x@^Cl1oq|M`YyZih5FJHcV
zY<*=R5{dfz`?t2X(w2+b-Q6`BjS7V#ZJx%)#<y?Zk|dcmkI(0O^ypDpS=sS6nu5pU
z4Gs=QB9W{WQzj=TFJ8Pz%cEAStyU}ZB!NJnudnZ~wEQoF!4QkZ(iXS2wsz3ft5T`Z
zBx<$#$B!RrM{aIzdOV)AmsKnl)9G~i6rbrEm{m(li$<ftFbv)4a5zjR)3<Nm2!bdr
zEv>4mYHVy&DwS+DJ2_x(Zq9DEQ{xp1#pB11&z?PtCLu|3W@ct~c6McDg&+tXk0+DK
znwpwqG8r`n!?1hz?ky}Vm`tX8x;PB6SZp?%(NhtLL{i&eu~;IJ=)r>r%gf8jGuhJ8
zLVZ+TUjFs#SK2B4^yyPaM~6TlpyiRtWJ5zkw80-fd?+q1KI&%ay1KeHH#gBb^m;vx
z<7o%8*=&tQW4GIfhKA4^)ytPJY0cPdwrkg}9duBEKrk{gf{yokz1Oc_FLZO+jE;_?
zMVQUztRYgV^yJBt)aJv74{4p7&1Uq%PK(Rs(k_;Pfq{IR$%$Ajw%KfG1!}cArwl@&
zaBXc3&EWU@o12@N#A>x#G;nNe>{uUr_4W1NzkjC=@9}u3`x!&y<Kt)pp-@P#*E5Xe
za=B>i^z^h`F3-IQR&Etj_<VjzNeQ+2^XJd~{e9-)U0q!b4GriXr_=fD*)xXW1VNzh
z3pkGRcs%AuryR0*dX`*HdsS7HUav<l)IcE6+1VKk2AL<>+uNi5=5RQfXUzvWWb?sb
zFdB_gn_{t;d2DZQZ$(7~y644<7cQ5Jc?Jx_&>Lqc6x!b2W*(le%F0UG4e!Q{8%zRw
zdU`^k5E?i>KA!8*@7}$OW_bVpJ)h6dy@@=~9(5BF6Inx4DwW&qMx&z9s8lMY1_%U#
z%F4>jN!V<*!{I=a3=R(F+f1&sTCLyjM~l$ubhN21h0SKSx3{AYh(sb0iA1zoEj30W
zkytF2FJHdgym|AWgYtMhqtS>a@p`=(#vc`_RBEwU&^mT^cXc{l>La(jy!`(C`^o7o
zYIJlI9oEy+liY8&+uPgQQ*YoRk?6^jC$uCJ6BCD?-sZKEqtR%dKYvb}gxhSkj~_oK
zUu?Ks?u82%Zr!?7UtdpqBA863*4EZ=IGo&UZEb!1`ZYB>4u``Qi^XcSy4~)0JdWe|
zrAwD?-@aX4U5zGjxm?}d-BVLj`E+qe91drAcsP;H#>U3d(vsKfjmP7upIWU}rBaEe
zdiwNf>agT0*z)o+?faEPl4Ngh?_X$}g5&tWz(6z_P5UoM6_3Zq#>P_L{FF*1ZO)h3
ze_}C%#bTW~bH-pW?Ck7ht$1f=$7nPjv;x=A(D3fvJ0{Cm8yg#aeSLp_8H=J)sb0N$
zMSIDm_<X*Rk&(8xwyX=7ckbMooSZypMbP8%7z~CC@4PuF<kGc7BDr$qid-(2%jH6$
zkjv#pA`!pe?{c}EPUq*(pI25^nB=LcsZl5ta=HB6xpNg26&QvEgTeLn_4)bvrKP3W
z+1X#eeifwPBl*#ytgNi4sHmi*WN&YeAc&kM?I=E<UtC;VR8&L|L^K+u9t{8h00000
m00000000000002+zx4;1M!N?gyuBCz0000<MNUMnLSTZBP!!Mr

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 52c9ed8d36537..d0a709c6de4da 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3092,6 +3092,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_unread_bar_some" = "Unread messages";
 
 "lng_maps_point" = "Location";
+"lng_live_location" = "Live Location";
+"lng_live_location_now" = "updated just now";
+"lng_live_location_minutes#one" = "updated {count} minute ago";
+"lng_live_location_minutes#other" = "updated {count} minutes ago";
+"lng_live_location_hours#one" = "updated {count} hour ago";
+"lng_live_location_hours#other" = "updated {count} hours ago";
+"lng_live_location_today" = "updated today at {time}";
+"lng_live_location_yesterday" = "updated yesterday at {time}";
+"lng_live_location_date_time" = "updated {date} at {time}";
 "lng_save_photo" = "Save image";
 "lng_save_video" = "Save video";
 "lng_save_audio_file" = "Save audio file";
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index e6dd5006ac901..50e063da570a6 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -1311,8 +1311,9 @@ std::unique_ptr<HistoryView::Media> MediaContact::createView(
 
 MediaLocation::MediaLocation(
 	not_null<HistoryItem*> parent,
-	const LocationPoint &point)
-: MediaLocation(parent, point, QString(), QString()) {
+	const LocationPoint &point,
+	TimeId livePeriod)
+: MediaLocation({}, parent, point, livePeriod, QString(), QString()) {
 }
 
 MediaLocation::MediaLocation(
@@ -1320,17 +1321,30 @@ MediaLocation::MediaLocation(
 	const LocationPoint &point,
 	const QString &title,
 	const QString &description)
+: MediaLocation({}, parent, point, TimeId(), title, description) {
+}
+
+MediaLocation::MediaLocation(
+	PrivateTag,
+	not_null<HistoryItem*> parent,
+	const LocationPoint &point,
+	TimeId livePeriod,
+	const QString &title,
+	const QString &description)
 : Media(parent)
 , _point(point)
 , _location(parent->history()->owner().location(point))
+, _livePeriod(livePeriod)
 , _title(title)
 , _description(description) {
 }
 
 std::unique_ptr<Media> MediaLocation::clone(not_null<HistoryItem*> parent) {
 	return std::make_unique<MediaLocation>(
+		PrivateTag(),
 		parent,
 		_point,
+		_livePeriod,
 		_title,
 		_description);
 }
@@ -1339,8 +1353,14 @@ CloudImage *MediaLocation::location() const {
 	return _location;
 }
 
+QString MediaLocation::typeString() const {
+	return _livePeriod
+		? tr::lng_live_location(tr::now)
+		: tr::lng_maps_point(tr::now);
+}
+
 ItemPreview MediaLocation::toPreview(ToPreviewOptions options) const {
-	const auto type = tr::lng_maps_point(tr::now);
+	const auto type = typeString();
 	const auto hasMiniImages = false;
 	const auto text = TextWithEntities{ .text = _title };
 	return {
@@ -1349,9 +1369,7 @@ ItemPreview MediaLocation::toPreview(ToPreviewOptions options) const {
 }
 
 TextWithEntities MediaLocation::notificationText() const {
-	return WithCaptionNotificationText(
-		tr::lng_maps_point(tr::now),
-		{ .text = _title });
+	return WithCaptionNotificationText(typeString(), { .text = _title });
 }
 
 QString MediaLocation::pinnedTextSubstring() const {
@@ -1360,7 +1378,7 @@ QString MediaLocation::pinnedTextSubstring() const {
 
 TextForMimeData MediaLocation::clipboardText() const {
 	auto result = TextForMimeData::Simple(
-		u"[ "_q + tr::lng_maps_point(tr::now) + u" ]\n"_q);
+		u"[ "_q + typeString() + u" ]\n"_q);
 	auto titleResult = TextUtilities::ParseEntities(
 		_title,
 		Ui::WebpageTextTitleOptions().flags);
@@ -1389,12 +1407,19 @@ std::unique_ptr<HistoryView::Media> MediaLocation::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing) {
-	return std::make_unique<HistoryView::Location>(
-		message,
-		_location,
-		_point,
-		_title,
-		_description);
+	return _livePeriod
+		? std::make_unique<HistoryView::Location>(
+			message,
+			_location,
+			_point,
+			replacing,
+			_livePeriod)
+		: std::make_unique<HistoryView::Location>(
+			message,
+			_location,
+			_point,
+			_title,
+			_description);
 }
 
 MediaCall::MediaCall(not_null<HistoryItem*> parent, const Call &call)
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index 1aae67928ebcb..c486799cd43a8 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -331,10 +331,14 @@ class MediaContact final : public Media {
 };
 
 class MediaLocation final : public Media {
+	struct PrivateTag {
+	};
+
 public:
 	MediaLocation(
 		not_null<HistoryItem*> parent,
-		const LocationPoint &point);
+		const LocationPoint &point,
+		TimeId livePeriod = 0);
 	MediaLocation(
 		not_null<HistoryItem*> parent,
 		const LocationPoint &point,
@@ -356,9 +360,21 @@ class MediaLocation final : public Media {
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing = nullptr) override;
 
+	MediaLocation(
+		PrivateTag,
+		not_null<HistoryItem*> parent,
+		const LocationPoint &point,
+		TimeId livePeriod,
+		const QString &title,
+		const QString &description);
+
 private:
+
+	[[nodiscard]] QString typeString() const;
+
 	LocationPoint _point;
 	not_null<CloudImage*> _location;
+	TimeId _livePeriod = 0;
 	QString _title;
 	QString _description;
 
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 0695742bb029c..171480ab60a9c 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -224,10 +224,12 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 			return nullptr;
 		});
 	}, [&](const MTPDmessageMediaGeoLive &media) -> Result {
+		const auto period = media.vperiod().v;
 		return media.vgeo().match([&](const MTPDgeoPoint &point) -> Result {
 			return std::make_unique<Data::MediaLocation>(
 				item,
-				Data::LocationPoint(point));
+				Data::LocationPoint(point),
+				media.vperiod().v);
 		}, [](const MTPDgeoPointEmpty &) -> Result {
 			return nullptr;
 		});
diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.cpp b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
index 5fab03d159c70..f16d65141c678 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_location.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
@@ -7,12 +7,14 @@ For license and copyright information please follow this link:
 */
 #include "history/view/media/history_view_location.h"
 
+#include "base/unixtime.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
 #include "history/history_item.h"
 #include "history/history_location_manager.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
+#include "lang/lang_keys.h"
 #include "ui/chat/chat_style.h"
 #include "ui/image/image.h"
 #include "ui/text/text_options.h"
@@ -24,6 +26,98 @@ For license and copyright information please follow this link:
 #include "styles/style_chat.h"
 
 namespace HistoryView {
+namespace {
+
+constexpr auto kUntilOffPeriod = std::numeric_limits<TimeId>::max();
+constexpr auto kLiveElapsedPartOpacity = 0.2;
+
+[[nodiscard]] TimeId ResolveUpdateDate(not_null<Element*> view) {
+	const auto item = view->data();
+	const auto edited = item->Get<HistoryMessageEdited>();
+	return edited ? edited->date : item->date();
+}
+
+[[nodiscard]] QString RemainingTimeText(
+		not_null<Element*> view,
+		TimeId period) {
+	if (period == kUntilOffPeriod) {
+		return QString(1, QChar(0x221E));
+	}
+	const auto elapsed = base::unixtime::now() - view->data()->date();
+	const auto remaining = std::clamp(period - elapsed, 0, period);
+	if (remaining < 10) {
+		return tr::lng_seconds_tiny(tr::now, lt_count, remaining);
+	} else if (remaining < 600) {
+		return tr::lng_minutes_tiny(tr::now, lt_count, remaining / 60);
+	} else if (remaining < 3600) {
+		return QString::number(remaining / 60);
+	} else if (remaining < 86400) {
+		return tr::lng_hours_tiny(tr::now, lt_count, remaining / 3600);
+	}
+	return tr::lng_days_tiny(tr::now, lt_count, remaining / 86400);
+}
+
+[[nodiscard]] float64 RemainingTimeProgress(
+		not_null<Element*> view,
+		TimeId period) {
+	if (period == kUntilOffPeriod) {
+		return 1.;
+	} else if (period < 1) {
+		return 0.;
+	}
+	const auto elapsed = base::unixtime::now() - view->data()->date();
+	return std::clamp(period - elapsed, 0, period) / float64(period);
+}
+
+} // namespace
+
+struct Location::Live {
+	explicit Live(TimeId period) : period(period) {
+	}
+
+	base::Timer updateStatusTimer;
+	base::Timer updateRemainingTimer;
+	QImage previous;
+	QImage previousCache;
+	Ui::BubbleRounding previousRounding;
+	Ui::Animations::Simple crossfade;
+	TimeId period = 0;
+	int thumbnailHeight = 0;
+};
+
+Location::Location(
+	not_null<Element*> parent,
+	not_null<Data::CloudImage*> data,
+	Data::LocationPoint point,
+	Element *replacing,
+	TimeId livePeriod)
+: Media(parent)
+, _data(data)
+, _live(CreateLiveTracker(parent, livePeriod))
+, _title(st::msgMinWidth)
+, _description(st::msgMinWidth)
+, _link(std::make_shared<LocationClickHandler>(point)) {
+	if (_live) {
+		_title.setText(
+			st::webPageTitleStyle,
+			tr::lng_live_location(tr::now),
+			Ui::WebpageTextTitleOptions());
+		_live->updateStatusTimer.setCallback([=] {
+			updateLiveStatus();
+			checkLiveFinish();
+		});
+		_live->updateRemainingTimer.setCallback([=] {
+			checkLiveFinish();
+		});
+		updateLiveStatus();
+		if (const auto media = replacing ? replacing->media() : nullptr) {
+			_live->previous = media->locationTakeImage();
+			if (!_live->previous.isNull()) {
+				history()->owner().registerHeavyViewPart(_parent);
+			}
+		}
+	}
+}
 
 Location::Location(
 	not_null<Element*> parent,
@@ -53,18 +147,106 @@ Location::Location(
 }
 
 Location::~Location() {
-	if (_media) {
-		_media = nullptr;
+	if (hasHeavyPart()) {
+		unloadHeavyPart();
 		_parent->checkHeavyPart();
 	}
 }
 
+void Location::checkLiveFinish() {
+	Expects(_live != nullptr);
+
+	const auto now = base::unixtime::now();
+	const auto item = _parent->data();
+	const auto start = item->date();
+	if (_live->period != kUntilOffPeriod && now - start >= _live->period) {
+		_live = nullptr;
+		item->history()->owner().requestViewResize(_parent);
+	} else {
+		_parent->repaint();
+	}
+}
+
+std::unique_ptr<Location::Live> Location::CreateLiveTracker(
+		not_null<Element*> parent,
+		TimeId period) {
+	if (!period) {
+		return nullptr;
+	}
+	const auto now = base::unixtime::now();
+	const auto date = parent->data()->date();
+	return (now < date || now - date < period)
+		? std::make_unique<Live>(period)
+		: nullptr;
+}
+
+void Location::updateLiveStatus() {
+	const auto date = ResolveUpdateDate(_parent);
+	const auto now = base::unixtime::now();
+	const auto elapsed = now - date;
+	auto next = TimeId();
+	const auto text = [&] {
+		if (elapsed < 60) {
+			next = 60 - elapsed;
+			return tr::lng_live_location_now(tr::now);
+		} else if (const auto minutes = elapsed / 60; minutes < 60) {
+			next = 60 - (elapsed % 60);
+			return tr::lng_live_location_minutes(tr::now, lt_count, minutes);
+		} else if (const auto hours = elapsed / 3600; hours < 12) {
+			next = 3600 - (elapsed % 3600);
+			return tr::lng_live_location_hours(tr::now, lt_count, hours);
+		}
+		const auto dateFull = base::unixtime::parse(date);
+		const auto nowFull = base::unixtime::parse(now);
+		const auto nextTomorrow = [&] {
+			const auto tomorrow = nowFull.date().addDays(1);
+			next = nowFull.secsTo(QDateTime(tomorrow, QTime(0, 0)));
+		};
+		const auto locale = QLocale();
+		const auto format = QLocale::ShortFormat;
+		if (dateFull.date() == nowFull.date()) {
+			nextTomorrow();
+			const auto time = locale.toString(dateFull.time(), format);
+			return tr::lng_live_location_today(tr::now, lt_time, time);
+		} else if (dateFull.date().addDays(1) == nowFull.date()) {
+			nextTomorrow();
+			const auto time = locale.toString(dateFull.time(), format);
+			return tr::lng_live_location_yesterday(tr::now, lt_time, time);
+		}
+		return tr::lng_live_location_date_time(
+			tr::now,
+			lt_date,
+			locale.toString(dateFull.date(), format),
+			lt_time,
+			locale.toString(dateFull.time(), format));
+	}();
+	_description.setMarkedText(
+		st::webPageDescriptionStyle,
+		{ text },
+		Ui::WebpageTextDescriptionOptions());
+	if (next > 0 && next < 86400) {
+		_live->updateStatusTimer.callOnce(next * crl::time(1000));
+	}
+}
+
+QImage Location::locationTakeImage() {
+	if (_media && !_media->isNull()) {
+		return *_media;
+	} else if (_live && !_live->previous.isNull()) {
+		return _live->previous;
+	}
+	return {};
+}
+
 void Location::unloadHeavyPart() {
 	_media = nullptr;
+	if (_live) {
+		_live->previous = QImage();
+	}
 }
 
 bool Location::hasHeavyPart() const {
-	return (_media != nullptr);
+	return (_media != nullptr) || (_live && !_live->previous.isNull());
 }
 
 void Location::ensureMediaCreated() const {
@@ -99,8 +281,14 @@ QSize Location::countOptimalSize() {
 		}
 		if (!_title.isEmpty() || !_description.isEmpty()) {
 			minHeight += st::mediaInBubbleSkip;
-			if (isBubbleTop()) {
-				minHeight += st::msgPadding.top();
+			if (_live) {
+				if (isBubbleBottom()) {
+					minHeight += st::msgPadding.bottom();
+				}
+			} else {
+				if (isBubbleTop()) {
+					minHeight += st::msgPadding.top();
+				}
 			}
 		}
 	}
@@ -128,6 +316,9 @@ QSize Location::countCurrentSize(int newWidth) {
 		std::min(newWidth, st::maxMediaSize));
 	accumulate_max(newWidth, minWidth);
 	accumulate_max(newHeight, st::minPhotoSize);
+	if (_live) {
+		_live->thumbnailHeight = newHeight;
+	}
 	if (_parent->hasBubble()) {
 		if (!_title.isEmpty()) {
 			newHeight += qMin(_title.countHeight(newWidth - st::msgPadding.left() - st::msgPadding.right()), st::webPageTitleFont->height * 2);
@@ -137,8 +328,14 @@ QSize Location::countCurrentSize(int newWidth) {
 		}
 		if (!_title.isEmpty() || !_description.isEmpty()) {
 			newHeight += st::mediaInBubbleSkip;
-			if (isBubbleTop()) {
-				newHeight += st::msgPadding.top();
+			if (_live) {
+				if (isBubbleBottom()) {
+					newHeight += st::msgPadding.bottom();
+				}
+			} else {
+				if (isBubbleTop()) {
+					newHeight += st::msgPadding.top();
+				}
 			}
 		}
 	}
@@ -156,20 +353,27 @@ TextSelection Location::fromDescriptionSelection(
 }
 
 void Location::draw(Painter &p, const PaintContext &context) const {
-	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
+	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) {
+		return;
+	}
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	bool bubble = _parent->hasBubble();
 	const auto st = context.st;
 	const auto stm = context.messageStyle();
 
 	const auto hasText = !_title.isEmpty() || !_description.isEmpty();
-	const auto rounding = adjustedBubbleRounding(
-		hasText ? RectPart::FullTop : RectPart());
-	if (bubble) {
-		if (hasText) {
-			if (isBubbleTop()) {
-				painty += st::msgPadding.top();
-			}
+	const auto rounding = adjustedBubbleRounding(_live
+		? RectPart::FullBottom
+		: hasText
+		? RectPart::FullTop
+		: RectPart());
+	const auto paintText = [&] {
+		if (_live) {
+			painty += st::mediaInBubbleSkip;
+		} else if (!hasText) {
+			return;
+		} else if (isBubbleTop()) {
+			painty += st::msgPadding.top();
 		}
 
 		auto textw = width() - st::msgPadding.left() - st::msgPadding.right();
@@ -180,24 +384,45 @@ void Location::draw(Painter &p, const PaintContext &context) const {
 			painty += qMin(_title.countHeight(textw), 2 * st::webPageTitleFont->height);
 		}
 		if (!_description.isEmpty()) {
+			if (_live) {
+				p.setPen(stm->msgDateFg);
+			}
 			_description.drawLeftElided(p, paintx + st::msgPadding.left(), painty, textw, width(), 3, style::al_left, 0, -1, 0, false, toDescriptionSelection(context.selection));
 			painty += qMin(_description.countHeight(textw), 3 * st::webPageDescriptionFont->height);
 		}
-		if (!_title.isEmpty() || !_description.isEmpty()) {
+		if (!_live) {
 			painty += st::mediaInBubbleSkip;
+			painth -= painty;
 		}
-		painth -= painty;
+	};
+	if (!_live) {
+		paintText();
 	}
-	auto rthumb = QRect(paintx, painty, paintw, painth);
+	const auto thumbh = _live ? _live->thumbnailHeight : painth;
+	auto rthumb = QRect(paintx, painty, paintw, thumbh);
 	if (!bubble) {
 		fillImageShadow(p, rthumb, rounding, context);
 	}
 
 	ensureMediaCreated();
 	validateImageCache(rthumb.size(), rounding);
-	if (!_imageCache.isNull()) {
+	const auto paintPrevious = _live && !_live->previous.isNull();
+	auto opacity = _imageCache.isNull() ? 0. : 1.;
+	if (paintPrevious) {
+		opacity = _live->crossfade.value(opacity);
+		if (opacity < 1.) {
+			p.drawImage(rthumb.topLeft(), _live->previousCache);
+			if (opacity > 0.) {
+				p.setOpacity(opacity);
+			}
+		}
+	}
+	if (!_imageCache.isNull() && opacity > 0.) {
 		p.drawImage(rthumb.topLeft(), _imageCache);
-	} else if (!bubble) {
+		if (opacity < 1.) {
+			p.setOpacity(1.);
+		}
+	} else if (!bubble && !paintPrevious) {
 		Ui::PaintBubble(
 			p,
 			Ui::SimpleBubble{
@@ -223,8 +448,12 @@ void Location::draw(Painter &p, const PaintContext &context) const {
 	if (context.selected()) {
 		fillImageOverlay(p, rthumb, rounding, context);
 	}
-
-	if (_parent->media() == this) {
+	if (_live) {
+		painty += _live->thumbnailHeight;
+		painth -= _live->thumbnailHeight;
+		paintLiveRemaining(p, context, { paintx, painty, paintw, painth });
+		paintText();
+	} else if (_parent->media() == this) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = height();
 		_parent->drawInfo(
@@ -244,25 +473,114 @@ void Location::draw(Painter &p, const PaintContext &context) const {
 	}
 }
 
+void Location::paintLiveRemaining(
+		QPainter &p,
+		const PaintContext &context,
+		QRect bottom) const {
+	const auto size = st::liveLocationRemainingSize;
+	const auto skip = (bottom.height() - size) / 2;
+	const auto rect = QRect(
+		bottom.x() + bottom.width() - size - skip,
+		bottom.y() + skip,
+		size,
+		size);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto stm = context.messageStyle();
+	const auto color = stm->msgServiceFg->c;
+	const auto untiloff = (_live->period == kUntilOffPeriod);
+	const auto progress = RemainingTimeProgress(_parent, _live->period);
+	const auto part = 1. / 360;
+	const auto full = (progress >= 1. - part);
+	auto elapsed = color;
+	if (!full) {
+		elapsed.setAlphaF(elapsed.alphaF() * kLiveElapsedPartOpacity);
+	}
+	auto pen = QPen(elapsed);
+	const auto stroke = style::ConvertScaleExact(2.);
+	pen.setWidthF(stroke);
+	p.setPen(pen);
+	p.setBrush(Qt::NoBrush);
+	p.drawEllipse(rect);
+
+	if (untiloff) {
+		stm->liveLocationLongIcon.paintInCenter(p, rect);
+	} else {
+		if (!full && progress > part) {
+			auto pen = QPen(color);
+			pen.setWidthF(stroke);
+			p.setPen(pen);
+			p.drawArc(rect, 90 * 16, int(base::SafeRound(360 * 16 * progress)));
+		}
+
+		p.setPen(stm->msgServiceFg);
+		p.setFont(st::semiboldFont);
+		const auto text = RemainingTimeText(_parent, _live->period);
+		p.drawText(rect, text, style::al_center);
+		const auto each = std::clamp(_live->period / 360, 1, 86400);
+		_live->updateRemainingTimer.callOnce(each * crl::time(1000));
+	}
+}
+
 void Location::validateImageCache(
 		QSize outer,
 		Ui::BubbleRounding rounding) const {
 	Expects(_media != nullptr);
 
+	if (_live && !_live->previous.isNull()) {
+		validateImageCache(
+			_live->previous,
+			_live->previousCache,
+			_live->previousRounding,
+			outer,
+			rounding);
+	}
+	validateImageCache(
+		*_media,
+		_imageCache,
+		_imageCacheRounding,
+		outer,
+		rounding);
+	checkLiveCrossfadeStart();
+}
+
+void Location::checkLiveCrossfadeStart() const {
+	if (!_live
+		|| _live->previous.isNull()
+		|| !_media
+		|| _media->isNull()
+		|| _live->crossfade.animating()) {
+		return;
+	}
+	_live->crossfade.start([=] {
+		if (!_live->crossfade.animating()) {
+			_live->previous = QImage();
+			_live->previousCache = QImage();
+		}
+		_parent->repaint();
+	}, 0., 1., st::fadeWrapDuration);
+}
+
+void Location::validateImageCache(
+		const QImage &source,
+		QImage &cache,
+		Ui::BubbleRounding &cacheRounding,
+		QSize outer,
+		Ui::BubbleRounding rounding) const {
+	if (source.isNull()) {
+		return;
+	}
 	const auto ratio = style::DevicePixelRatio();
-	if ((_imageCache.size() == (outer * ratio)
-			&& _imageCacheRounding == rounding)
-		|| _media->isNull()) {
+	if (cache.size() == (outer * ratio) && cacheRounding == rounding) {
 		return;
 	}
-	_imageCache = Images::Round(
-		_media->scaled(
+	cache = Images::Round(
+		source.scaled(
 			outer * ratio,
 			Qt::IgnoreAspectRatio,
 			Qt::SmoothTransformation),
 		MediaRoundingMask(rounding));
-	_imageCache.setDevicePixelRatio(ratio);
-	_imageCacheRounding = rounding;
+	cache.setDevicePixelRatio(ratio);
+	cacheRounding = rounding;
 }
 
 TextState Location::textState(QPoint point, StateRequest request) const {
@@ -275,11 +593,13 @@ TextState Location::textState(QPoint point, StateRequest request) const {
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	bool bubble = _parent->hasBubble();
 
-	if (bubble) {
-		if (!_title.isEmpty() || !_description.isEmpty()) {
-			if (isBubbleTop()) {
-				painty += st::msgPadding.top();
-			}
+	auto checkText = [&] {
+		if (_live) {
+			painty += st::mediaInBubbleSkip;
+		} else if (_title.isEmpty() && _description.isEmpty()) {
+			return false;
+		} else if (isBubbleTop()) {
+			painty += st::msgPadding.top();
 		}
 
 		auto textw = width() - st::msgPadding.left() - st::msgPadding.right();
@@ -292,7 +612,7 @@ TextState Location::textState(QPoint point, StateRequest request) const {
 					textw,
 					width(),
 					request.forText()));
-				return result;
+				return true;
 			} else if (point.y() >= painty + titleh) {
 				symbolAdd += _title.length();
 			}
@@ -306,6 +626,8 @@ TextState Location::textState(QPoint point, StateRequest request) const {
 					textw,
 					width(),
 					request.forText()));
+				result.symbol += symbolAdd;
+				return true;
 			} else if (point.y() >= painty + descriptionh) {
 				symbolAdd += _description.length();
 			}
@@ -315,11 +637,22 @@ TextState Location::textState(QPoint point, StateRequest request) const {
 			painty += st::mediaInBubbleSkip;
 		}
 		painth -= painty;
+		return false;
+	};
+	if (!_live && checkText()) {
+		return result;
 	}
-	if (QRect(paintx, painty, paintw, painth).contains(point) && _data) {
+	const auto thumbh = _live ? _live->thumbnailHeight : painth;
+	if (QRect(paintx, painty, paintw, thumbh).contains(point) && _data) {
 		result.link = _link;
 	}
-	if (_parent->media() == this) {
+	if (_live) {
+		painty += _live->thumbnailHeight;
+		painth -= _live->thumbnailHeight;
+		if (checkText()) {
+			return result;
+		}
+	} else if (_parent->media() == this) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = height();
 		const auto bottomInfoResult = _parent->bottomInfoTextState(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.h b/Telegram/SourceFiles/history/view/media/history_view_location.h
index ec412fd00c58d..9e431ef740244 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_location.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_location.h
@@ -22,8 +22,14 @@ class Location : public Media {
 		not_null<Element*> parent,
 		not_null<Data::CloudImage*> data,
 		Data::LocationPoint point,
-		const QString &title = QString(),
-		const QString &description = QString());
+		Element *replacing = nullptr,
+		TimeId livePeriod = 0);
+	Location(
+		not_null<Element*> parent,
+		not_null<Data::CloudImage*> data,
+		Data::LocationPoint point,
+		const QString &title,
+		const QString &description);
 	~Location();
 
 	void draw(Painter &p, const PaintContext &context) const override;
@@ -58,15 +64,33 @@ class Location : public Media {
 		return isRoundedInBubbleBottom();
 	}
 
+	QImage locationTakeImage() override;
+
 	void unloadHeavyPart() override;
 	bool hasHeavyPart() const override;
 
 private:
+	struct Live;
+	[[nodiscard]] static std::unique_ptr<Live> CreateLiveTracker(
+		not_null<Element*> parent,
+		TimeId period);
+
 	void ensureMediaCreated() const;
 
 	void validateImageCache(
 		QSize outer,
 		Ui::BubbleRounding rounding) const;
+	void validateImageCache(
+		const QImage &source,
+		QImage &cache,
+		Ui::BubbleRounding &cacheRounding,
+		QSize outer,
+		Ui::BubbleRounding rounding) const;
+
+	void paintLiveRemaining(
+		QPainter &p,
+		const PaintContext &context,
+		QRect bottom) const;
 
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
@@ -79,7 +103,12 @@ class Location : public Media {
 	[[nodiscard]] int fullWidth() const;
 	[[nodiscard]] int fullHeight() const;
 
+	void checkLiveCrossfadeStart() const;
+	void updateLiveStatus();
+	void checkLiveFinish();
+
 	const not_null<Data::CloudImage*> _data;
+	mutable std::unique_ptr<Live> _live;
 	mutable std::shared_ptr<QImage> _media;
 	Ui::Text::String _title, _description;
 	ClickHandlerPtr _link;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index f64cb808b1999..56720e83f8a77 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -356,6 +356,10 @@ std::unique_ptr<StickerPlayer> Media::stickerTakePlayer(
 	return nullptr;
 }
 
+QImage Media::locationTakeImage() {
+	return QImage();
+}
+
 TextState Media::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h
index 1b835dcce4d06..f9ad5c987d456 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.h
@@ -190,6 +190,7 @@ class Media : public Object, public base::has_weak_ptr {
 	virtual std::unique_ptr<StickerPlayer> stickerTakePlayer(
 		not_null<DocumentData*> data,
 		const Lottie::ColorReplacements *replacements);
+	virtual QImage locationTakeImage();
 	virtual void checkAnimation() {
 	}
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 2cab84839cdc7..5dd77998a2da1 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1070,3 +1070,9 @@ chatIntroWidth: 224px;
 chatIntroTitleMargin: margins(11px, 16px, 11px, 4px);
 chatIntroMargin: margins(11px, 0px, 11px, 0px);
 chatIntroStickerPadding: margins(10px, 8px, 10px, 16px);
+
+liveLocationLongInIcon: icon {{ "chat/live_location_long", msgInServiceFg }};
+liveLocationLongInIconSelected: icon {{ "chat/live_location_long", msgInServiceFgSelected }};
+liveLocationLongOutIcon: icon {{ "chat/live_location_long", msgOutServiceFg }};
+liveLocationLongOutIconSelected: icon {{ "chat/live_location_long", msgOutServiceFgSelected }};
+liveLocationRemainingSize: 28px;
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index 9470d71d687fa..a532a31805dcb 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -543,6 +543,12 @@ ChatStyle::ChatStyle(rpl::producer<ColorIndicesCompressed> colorIndices) {
 		st::historyVoiceMessageInTTLSelected,
 		st::historyVoiceMessageOutTTL,
 		st::historyVoiceMessageOutTTLSelected);
+	make(
+		&MessageStyle::liveLocationLongIcon,
+		st::liveLocationLongInIcon,
+		st::liveLocationLongInIconSelected,
+		st::liveLocationLongOutIcon,
+		st::liveLocationLongOutIconSelected);
 
 	updateDarkValue();
 }
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.h b/Telegram/SourceFiles/ui/chat/chat_style.h
index 1053d630a8d2a..6b8cc459ba059 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.h
+++ b/Telegram/SourceFiles/ui/chat/chat_style.h
@@ -92,6 +92,7 @@ struct MessageStyle {
 	style::icon historyTranscribeLock = { Qt::Uninitialized };
 	style::icon historyTranscribeHide = { Qt::Uninitialized };
 	style::icon historyVoiceMessageTTL = { Qt::Uninitialized };
+	style::icon liveLocationLongIcon = { Qt::Uninitialized };
 	std::array<
 		std::unique_ptr<Text::QuotePaintCache>,
 		kColorPatternsCount> quoteCache;
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index ce00e278ef620..6351f95c6ab2c 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1510,22 +1510,82 @@ def runStages():
 """)
 
 if buildQt6:
-    stage('qt_6_2_8', """
+    qt6version = '6.2.8' if mac else '6.7.0'
+    qt6version_ = '6_2_8' if mac else '6_7_0'
+    arg0 = 'qt_' + qt6version_
+    arg1 = qt6version
+
+    stage('qt_' + qt6version_, """
+win:
+    git clone -b v{1} https://github.com/qt/qt5.git {0}
 mac:
-    git clone -b v6.2.8-lts-lgpl https://github.com/qt/qt5.git qt_6_2_8
-    cd qt_6_2_8
+    git clone -b v{1}-lts-lgpl https://github.com/qt/qt5.git {0}
+common:
+    cd {0}
     git submodule update --init --recursive qtbase qtimageformats qtsvg
-depends:patches/qtbase_6.2.8/*.patch
+depends:patches/qtbase_{1}/*.patch
     cd qtbase
-    find ../../patches/qtbase_6.2.8 -type f -print0 | sort -z | xargs -0 git apply -v
+win:
+    for /r %%i in (..\\..\\patches\\qtbase_{1}\\*) do git apply %%i -v
+    cd ..
+
+    SET CONFIGURATIONS=-debug
+release:
+    SET CONFIGURATIONS=-debug-and-release
+win:
+    """.format(arg0, arg1) + removeDir("\"%LIBS_DIR%\\Qt-\"" + qt6version) + """
+    SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
+    SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
+    SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
+    SET OPENSSL_DIR=%LIBS_DIR%\\openssl3
+    SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
+    SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
+    SET WEBP_DIR=%LIBS_DIR%\\libwebp
+    configure -prefix "%LIBS_DIR%\\Qt-{1}" ^
+        %CONFIGURATIONS% ^
+        -force-debug-info ^
+        -opensource ^
+        -confirm-license ^
+        -static ^
+        -static-runtime ^
+        -opengl es2 -no-angle ^
+        -I "%ANGLE_DIR%\\include" ^
+        -D "KHRONOS_STATIC=" ^
+        -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^
+        QMAKE_LIBS_OPENGL_ES2_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib d3d9.lib dxgi.lib dxguid.lib" ^
+        QMAKE_LIBS_OPENGL_ES2_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib d3d9.lib dxgi.lib dxguid.lib" ^
+        -egl ^
+        QMAKE_LIBS_EGL_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
+        QMAKE_LIBS_EGL_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
+        -openssl-linked ^
+        -I "%OPENSSL_DIR%\\include" ^
+        OPENSSL_LIBS_DEBUG="%OPENSSL_LIBS_DIR%.dbg\\libssl.lib %OPENSSL_LIBS_DIR%.dbg\\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
+        OPENSSL_LIBS_RELEASE="%OPENSSL_LIBS_DIR%\\libssl.lib %OPENSSL_LIBS_DIR%\\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
+        -I "%MOZJPEG_DIR%" ^
+        LIBJPEG_LIBS_DEBUG="%MOZJPEG_DIR%\\Debug\\jpeg-static.lib" ^
+        LIBJPEG_LIBS_RELEASE="%MOZJPEG_DIR%\\Release\\jpeg-static.lib" ^
+        -system-webp ^
+        -I "%WEBP_DIR%\\src" ^
+        -L "%WEBP_DIR%\\out\\release-static\\$X8664\\lib" ^
+        -mp ^
+        -no-feature-netlistmgr ^
+        -nomake examples ^
+        -nomake tests ^
+        -platform win32-msvc
+
+    jom -j%NUMBER_OF_PROCESSORS%
+    jom -j%NUMBER_OF_PROCESSORS% install
+
+mac:
+    find ../../patches/qtbase_{1} -type f -print0 | sort -z | xargs -0 git apply -v
     cd ..
-    sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
+    sed -i.bak 's/tqtc-//' {{qtimageformats,qtsvg}}/dependencies.yaml
 
     CONFIGURATIONS=-debug
 release:
     CONFIGURATIONS=-debug-and-release
 mac:
-    ./configure -prefix "$USED_PREFIX/Qt-6.2.8" \
+    ./configure -prefix "$USED_PREFIX/Qt-{1}" \
         $CONFIGURATIONS \
         -force-debug-info \
         -opensource \
@@ -1546,7 +1606,7 @@ def runStages():
 
     ninja
     ninja install
-""")
+""".format(arg0, arg1))
 
 stage('tg_owt', """
     git clone https://github.com/desktop-app/tg_owt.git

From 63e1731d7ca320a98f4e3bd087e45d6a7e8a7e65 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 Apr 2024 18:37:31 +0400
Subject: [PATCH 011/400] Fix premium preview bullet-dots.

Regression was introduced in 88751896af.
---
 Telegram/SourceFiles/boxes/premium_preview_box.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index da1ab9064bf3a..30f3127451b55 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -913,7 +913,7 @@ void PreviewBox(
 	auto businessOrder = Settings::BusinessFeaturesOrder(&show->session());
 	state->order = ranges::contains(businessOrder, descriptor.section)
 		? std::move(businessOrder)
-		: ranges::contains(businessOrder, descriptor.section)
+		: ranges::contains(premiumOrder, descriptor.section)
 		? std::move(premiumOrder)
 		: std::vector{ descriptor.section };
 

From bb6fd4bc4dbe36f3988d0baf5a60a32893d874f1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 Apr 2024 22:30:39 +0400
Subject: [PATCH 012/400] Update scheme, new sticker categories.

---
 Telegram/SourceFiles/api/api_statistics.cpp   |   8 +-
 .../chat_helpers/emoji_list_widget.cpp        |   7 +-
 .../chat_helpers/gifs_list_widget.cpp         |   2 +-
 .../chat_helpers/stickers_list_widget.cpp     |  30 +++-
 .../chat_helpers/tabbed_selector.cpp          |   9 +-
 .../chat_helpers/tabbed_selector.h            |   9 +-
 .../SourceFiles/data/data_emoji_statuses.cpp  |  38 +++--
 .../SourceFiles/data/data_emoji_statuses.h    |   3 +
 .../data/stickers/data_stickers.cpp           | 135 ++++++++++++++++++
 .../SourceFiles/data/stickers/data_stickers.h |   2 +
 Telegram/SourceFiles/mtproto/scheme/api.tl    |   7 +-
 .../SourceFiles/ui/controls/tabbed_search.cpp |   9 +-
 .../SourceFiles/ui/controls/tabbed_search.h   |   9 ++
 13 files changed, 238 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index 7139c5ebb1054..ce1966623cd2b 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -760,14 +760,14 @@ rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
 			channel()->inputChannel
 		)).done([=](const MTPstats_BroadcastRevenueStats &result) {
 			const auto &data = result.data();
-
+			const auto &balances = data.vbalances().data();
 			_data = Data::EarnStatistics{
 				.topHoursGraph = StatisticalGraphFromTL(
 					data.vtop_hours_graph()),
 				.revenueGraph = StatisticalGraphFromTL(data.vrevenue_graph()),
-				.currentBalance = data.vcurrent_balance().v,
-				.availableBalance = data.vavailable_balance().v,
-				.overallRevenue = data.voverall_revenue().v,
+				.currentBalance = balances.vcurrent_balance().v,
+				.availableBalance = balances.vavailable_balance().v,
+				.overallRevenue = balances.voverall_revenue().v,
 				.usdRate = data.vusd_rate().v,
 			};
 
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index c8148ae8e4875..2157e916827ed 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -573,12 +573,17 @@ EmojiListWidget::~EmojiListWidget() {
 
 void EmojiListWidget::setupSearch() {
 	const auto session = &_show->session();
+	const auto type = (_mode == Mode::EmojiStatus)
+		? TabbedSearchType::Status
+		: (_mode == Mode::UserpicBuilder)
+		? TabbedSearchType::ProfilePhoto
+		: TabbedSearchType::Emoji;
 	_search = MakeSearch(this, st(), [=](std::vector<QString> &&query) {
 		_nextSearchQuery = std::move(query);
 		InvokeQueued(this, [=] {
 			applyNextSearchQuery();
 		});
-	}, session, (_mode == Mode::EmojiStatus), _mode == Mode::UserpicBuilder);
+	}, session, type);
 }
 
 void EmojiListWidget::applyNextSearchQuery() {
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 72794de39b259..609f21989d977 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -820,7 +820,7 @@ void GifsListWidget::setupSearch() {
 			: SearchEmojiSectionSetId();
 		refreshIcons();
 		searchForGifs(accumulated);
-	}, session);
+	}, session, TabbedSearchType::Emoji);
 }
 
 int32 GifsListWidget::showInlineRows(bool newResults) {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 42ea6b934b510..07a02caa92b4c 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -547,6 +547,15 @@ void StickersListWidget::sendSearchRequest() {
 	}
 
 	_search->setLoading(true);
+
+	if (_searchQuery == Ui::PremiumGroupFakeEmoticon()) {
+		_search->setLoading(false);
+		_searchRequestId = 0;
+		_searchCache.emplace(_searchQuery, std::vector<uint64>());
+		showSearchResults();
+		return;
+	}
+
 	const auto hash = uint64(0);
 	_searchRequestId = _api.request(MTPmessages_SearchStickerSets(
 		MTP_flags(0),
@@ -570,10 +579,14 @@ void StickersListWidget::searchForSets(
 		return;
 	}
 
-	_filteredStickers = session().data().stickers().getListByEmoji(
-		std::move(emoji),
-		0,
-		true);
+	if (query == Ui::PremiumGroupFakeEmoticon()) {
+		_filteredStickers = session().data().stickers().getPremiumList(0);
+	} else {
+		_filteredStickers = session().data().stickers().getListByEmoji(
+			std::move(emoji),
+			0,
+			true);
+	}
 	if (_searchQuery != cleaned) {
 		_search->setLoading(false);
 		if (const auto requestId = base::take(_searchRequestId)) {
@@ -2604,15 +2617,18 @@ void StickersListWidget::beforeHiding() {
 
 void StickersListWidget::setupSearch() {
 	const auto session = &_show->session();
+	const auto type = (_mode == Mode::UserpicBuilder)
+		? TabbedSearchType::ProfilePhoto
+		: TabbedSearchType::Stickers;
 	_search = MakeSearch(this, st(), [=](std::vector<QString> &&query) {
 		auto set = base::flat_set<EmojiPtr>();
 		auto text = ranges::accumulate(query, QString(), [](
-				QString a,
-				QString b) {
+			QString a,
+			QString b) {
 			return a.isEmpty() ? b : (a + ' ' + b);
 		});
 		searchForSets(std::move(text), SearchEmoji(query, set));
-	}, session, false, (_mode == Mode::UserpicBuilder));
+	}, session, type);
 }
 
 void StickersListWidget::displaySet(uint64 setId) {
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index e57b3adc8a75f..7f8a915c7d55e 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -307,16 +307,17 @@ std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 		const style::EmojiPan &st,
 		Fn<void(std::vector<QString>&&)> callback,
 		not_null<Main::Session*> session,
-		bool statusCategories,
-		bool profilePhotoCategories) {
+		TabbedSearchType type) {
 	using Descriptor = Ui::SearchDescriptor;
 	const auto owner = &session->data();
 	auto result = std::make_unique<Ui::TabbedSearch>(parent, st, Descriptor{
 		.st = st.search,
-		.groups = (profilePhotoCategories
+		.groups = ((type == TabbedSearchType::ProfilePhoto)
 			? owner->emojiStatuses().profilePhotoGroupsValue()
-			: statusCategories
+			: (type == TabbedSearchType::Status)
 			? owner->emojiStatuses().statusGroupsValue()
+			: (type == TabbedSearchType::Stickers)
+			? owner->emojiStatuses().stickerGroupsValue()
 			: owner->emojiStatuses().emojiGroupsValue()),
 		.customEmojiFactory = owner->customEmojiManager().factory(
 			Data::CustomEmojiManager::SizeTag::SetIcon,
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index 606f1a92640da..f663d470a4d64 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -98,13 +98,18 @@ struct TabbedSelectorDescriptor {
 	ComposeFeatures features;
 };
 
+enum class TabbedSearchType {
+	Emoji,
+	Status,
+	ProfilePhoto,
+	Stickers,
+};
 [[nodiscard]] std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 	not_null<Ui::RpWidget*> parent,
 	const style::EmojiPan &st,
 	Fn<void(std::vector<QString>&&)> callback,
 	not_null<Main::Session*> session,
-	bool statusCategories = false,
-	bool profilePhotoCategories = false);
+	TabbedSearchType type);
 
 class TabbedSelector : public Ui::RpWidget {
 public:
diff --git a/Telegram/SourceFiles/data/data_emoji_statuses.cpp b/Telegram/SourceFiles/data/data_emoji_statuses.cpp
index dd1ad583bc06d..e00dd8910bc94 100644
--- a/Telegram/SourceFiles/data/data_emoji_statuses.cpp
+++ b/Telegram/SourceFiles/data/data_emoji_statuses.cpp
@@ -153,6 +153,11 @@ auto EmojiStatuses::statusGroupsValue() const -> rpl::producer<Groups> {
 	return _statusGroups.data.value();
 }
 
+auto EmojiStatuses::stickerGroupsValue() const -> rpl::producer<Groups> {
+	const_cast<EmojiStatuses*>(this)->requestStickerGroups();
+	return _stickerGroups.data.value();
+}
+
 auto EmojiStatuses::profilePhotoGroupsValue() const
 -> rpl::producer<Groups> {
 	const_cast<EmojiStatuses*>(this)->requestProfilePhotoGroups();
@@ -172,6 +177,12 @@ void EmojiStatuses::requestStatusGroups() {
 		MTPmessages_GetEmojiStatusGroups(MTP_int(_statusGroups.hash)));
 }
 
+void EmojiStatuses::requestStickerGroups() {
+	requestGroups(
+		&_stickerGroups,
+		MTPmessages_GetEmojiStickerGroups(MTP_int(_stickerGroups.hash)));
+}
+
 void EmojiStatuses::requestProfilePhotoGroups() {
 	requestGroups(
 		&_profilePhotoGroups,
@@ -185,15 +196,24 @@ void EmojiStatuses::requestProfilePhotoGroups() {
 	auto result = std::vector<Ui::EmojiGroup>();
 	result.reserve(list.size());
 	for (const auto &group : list) {
-		const auto &data = group.data();
-		auto emoticons = ranges::views::all(
-			data.vemoticons().v
-		) | ranges::views::transform([](const MTPstring &emoticon) {
-			return qs(emoticon);
-		}) | ranges::to_vector;
-		result.push_back({
-			.iconId = QString::number(data.vicon_emoji_id().v),
-			.emoticons = std::move(emoticons),
+		group.match([&](const MTPDemojiGroupPremium &data) {
+			result.push_back({
+				.iconId = QString::number(data.vicon_emoji_id().v),
+				.type = Ui::EmojiGroupType::Premium,
+			});
+		}, [&](const auto &data) {
+			auto emoticons = ranges::views::all(
+				data.vemoticons().v
+			) | ranges::views::transform([](const MTPstring &emoticon) {
+				return qs(emoticon);
+			}) | ranges::to_vector;
+			result.push_back({
+				.iconId = QString::number(data.vicon_emoji_id().v),
+				.emoticons = std::move(emoticons),
+				.type = (MTPDemojiGroupGreeting::Is<decltype(data)>()
+					? Ui::EmojiGroupType::Greeting
+					: Ui::EmojiGroupType::Normal),
+			});
 		});
 	}
 	return result;
diff --git a/Telegram/SourceFiles/data/data_emoji_statuses.h b/Telegram/SourceFiles/data/data_emoji_statuses.h
index 5501eb8bc0437..0a0b75ba22273 100644
--- a/Telegram/SourceFiles/data/data_emoji_statuses.h
+++ b/Telegram/SourceFiles/data/data_emoji_statuses.h
@@ -60,9 +60,11 @@ class EmojiStatuses final {
 	using Groups = std::vector<Ui::EmojiGroup>;
 	[[nodiscard]] rpl::producer<Groups> emojiGroupsValue() const;
 	[[nodiscard]] rpl::producer<Groups> statusGroupsValue() const;
+	[[nodiscard]] rpl::producer<Groups> stickerGroupsValue() const;
 	[[nodiscard]] rpl::producer<Groups> profilePhotoGroupsValue() const;
 	void requestEmojiGroups();
 	void requestStatusGroups();
+	void requestStickerGroups();
 	void requestProfilePhotoGroups();
 
 private:
@@ -124,6 +126,7 @@ class EmojiStatuses final {
 
 	GroupsType _emojiGroups;
 	GroupsType _statusGroups;
+	GroupsType _stickerGroups;
 	GroupsType _profilePhotoGroups;
 
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index f6da8553d7974..057e1d8cf3004 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -1132,6 +1132,141 @@ void Stickers::gifsReceived(const QVector<MTPDocument> &items, uint64 hash) {
 	notifySavedGifsUpdated();
 }
 
+std::vector<not_null<DocumentData*>> Stickers::getPremiumList(uint64 seed) {
+	struct StickerWithDate {
+		not_null<DocumentData*> document;
+		TimeId date = 0;
+	};
+	auto result = std::vector<StickerWithDate>();
+	auto &sets = setsRef();
+	auto setsToRequest = base::flat_map<uint64, uint64>();
+
+	const auto add = [&](not_null<DocumentData*> document, TimeId date) {
+		if (ranges::find(result, document, [](const StickerWithDate &data) {
+			return data.document;
+		}) == result.end()) {
+			result.push_back({ document, date });
+		}
+	};
+
+	constexpr auto kSlice = 65536;
+	const auto CreateSortKey = [&](
+			not_null<DocumentData*> document,
+			int base) {
+		if (document->sticker() && document->sticker()->isAnimated()) {
+			base += kSlice;
+		}
+		return TimeId(base + int((document->id ^ seed) % kSlice));
+	};
+	const auto CreateRecentSortKey = [&](not_null<DocumentData*> document) {
+		return CreateSortKey(document, kSlice * 6);
+	};
+	auto myCounter = 0;
+	const auto CreateMySortKey = [&](not_null<DocumentData*> document) {
+		auto base = kSlice * 6;
+		if (!document->sticker() || !document->sticker()->isAnimated()) {
+			base -= kSlice;
+		}
+		return (base - (++myCounter));
+	};
+	const auto CreateFeaturedSortKey = [&](not_null<DocumentData*> document) {
+		return CreateSortKey(document, kSlice * 2);
+	};
+	const auto CreateOtherSortKey = [&](not_null<DocumentData*> document) {
+		return CreateSortKey(document, 0);
+	};
+	const auto InstallDateAdjusted = [&](
+			TimeId date,
+			not_null<DocumentData*> document) {
+		return (document->sticker() && document->sticker()->isAnimated())
+			? date
+			: date / 2;
+	};
+	const auto RecentInstallDate = [&](not_null<DocumentData*> document) {
+		Expects(document->sticker() != nullptr);
+
+		const auto sticker = document->sticker();
+		if (sticker->set.id) {
+			const auto setIt = sets.find(sticker->set.id);
+			if (setIt != sets.end()) {
+				return InstallDateAdjusted(setIt->second->installDate, document);
+			}
+		}
+		return TimeId(0);
+	};
+
+	auto recentIt = sets.find(Stickers::CloudRecentSetId);
+	if (recentIt != sets.cend()) {
+		const auto recent = recentIt->second.get();
+		const auto count = int(recent->stickers.size());
+		result.reserve(count);
+		for (auto i = 0; i != count; ++i) {
+			const auto document = recent->stickers[i];
+			auto index = i;
+			if (!document->isPremiumSticker()) {
+				continue;
+			} else {
+				index = recent->stickers.indexOf(document);
+			}
+			const auto usageDate = (recent->dates.empty() || index < 0)
+				? 0
+				: recent->dates[index];
+			const auto date = usageDate
+				? usageDate
+				: RecentInstallDate(document);
+			result.push_back({
+				document,
+				date ? date : CreateRecentSortKey(document) });
+		}
+	}
+	const auto addList = [&](
+			const StickersSetsOrder &order,
+			SetFlag skip) {
+		for (const auto setId : order) {
+			auto it = sets.find(setId);
+			if (it == sets.cend() || (it->second->flags & skip)) {
+				continue;
+			}
+			const auto set = it->second.get();
+			if (set->emoji.empty()) {
+				setsToRequest.emplace(set->id, set->accessHash);
+				set->flags |= SetFlag::NotLoaded;
+				continue;
+			}
+			const auto my = (set->flags & SetFlag::Installed);
+			result.reserve(result.size() + set->stickers.size());
+			for (const auto document : set->stickers) {
+				if (!document->isPremiumSticker()) {
+					continue;
+				}
+				const auto installDate = my ? set->installDate : TimeId(0);
+				const auto date = (installDate > 1)
+					? InstallDateAdjusted(installDate, document)
+					: my
+					? CreateMySortKey(document)
+					: CreateFeaturedSortKey(document);
+				add(document, date);
+			}
+		}
+	};
+
+	addList(setsOrder(), SetFlag::Archived);
+	addList(featuredSetsOrder(), SetFlag::Installed);
+
+	if (!setsToRequest.empty()) {
+		for (const auto &[setId, accessHash] : setsToRequest) {
+			session().api().scheduleStickerSetRequest(setId, accessHash);
+		}
+		session().api().requestStickerSets();
+	}
+
+	ranges::sort(result, std::greater<>(), &StickerWithDate::date);
+
+	return result
+		| ranges::views::transform(&StickerWithDate::document)
+		| ranges::to_vector;
+}
+
 std::vector<not_null<DocumentData*>> Stickers::getListByEmoji(
 		std::vector<EmojiPtr> emoji,
 		uint64 seed,
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.h b/Telegram/SourceFiles/data/stickers/data_stickers.h
index d5a192b4be46f..426b034aaae80 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.h
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.h
@@ -235,6 +235,8 @@ class Stickers final {
 		const MTPmessages_FeaturedStickers &result);
 	void gifsReceived(const QVector<MTPDocument> &items, uint64 hash);
 
+	[[nodiscard]] std::vector<not_null<DocumentData*>> getPremiumList(
+		uint64 seed);
 	[[nodiscard]] std::vector<not_null<DocumentData*>> getListByEmoji(
 		std::vector<EmojiPtr> emoji,
 		uint64 seed,
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index a75781792ad81..963785e0b413e 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1519,6 +1519,8 @@ emojiListNotModified#481eadfa = EmojiList;
 emojiList#7a1e11d1 hash:long document_id:Vector<long> = EmojiList;
 
 emojiGroup#7a9abda9 title:string icon_emoji_id:long emoticons:Vector<string> = EmojiGroup;
+emojiGroupGreeting#80d26cc7 title:string icon_emoji_id:long emoticons:Vector<string> = EmojiGroup;
+emojiGroupPremium#93bcf34 title:string icon_emoji_id:long = EmojiGroup;
 
 messages.emojiGroupsNotModified#6fb4ad87 = messages.EmojiGroups;
 messages.emojiGroups#881fb94b hash:int groups:Vector<EmojiGroup> = messages.EmojiGroups;
@@ -1762,7 +1764,7 @@ channels.sponsoredMessageReportResultChooseOption#846f9e42 title:string options:
 channels.sponsoredMessageReportResultAdsHidden#3e3bcf2f = channels.SponsoredMessageReportResult;
 channels.sponsoredMessageReportResultReported#ad798849 = channels.SponsoredMessageReportResult;
 
-stats.broadcastRevenueStats#d07b4bad top_hours_graph:StatsGraph revenue_graph:StatsGraph current_balance:long available_balance:long overall_revenue:long usd_rate:double = stats.BroadcastRevenueStats;
+stats.broadcastRevenueStats#5407e297 top_hours_graph:StatsGraph revenue_graph:StatsGraph balances:BroadcastRevenueBalances usd_rate:double = stats.BroadcastRevenueStats;
 
 stats.broadcastRevenueWithdrawalUrl#ec659737 url:string = stats.BroadcastRevenueWithdrawalUrl;
 
@@ -1777,6 +1779,8 @@ reactionNotificationsFromAll#4b9e22a0 = ReactionNotificationsFrom;
 
 reactionsNotifySettings#56e34970 flags:# messages_notify_from:flags.0?ReactionNotificationsFrom stories_notify_from:flags.1?ReactionNotificationsFrom sound:NotificationSound show_previews:Bool = ReactionsNotifySettings;
 
+broadcastRevenueBalances#8438f1c6 current_balance:long available_balance:long overall_revenue:long = BroadcastRevenueBalances;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2165,6 +2169,7 @@ messages.sendQuickReplyMessages#6c750de1 peer:InputPeer shortcut_id:int id:Vecto
 messages.deleteQuickReplyMessages#e105e910 shortcut_id:int id:Vector<int> = Updates;
 messages.toggleDialogFilterTags#fd2dda49 enabled:Bool = Bool;
 messages.getMyStickers#d0b5e1fc offset_id:long limit:int = messages.MyStickers;
+messages.getEmojiStickerGroups#1dd840f5 hash:int = messages.EmojiGroups;
 
 updates.getState#edd4882a = updates.State;
 updates.getDifference#19c2f763 flags:# pts:int pts_limit:flags.1?int pts_total_limit:flags.0?int date:int qts:int qts_limit:flags.2?int = updates.Difference;
diff --git a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
index 6aaea70dc4895..7acc65a8ffacf 100644
--- a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
+++ b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
@@ -273,6 +273,11 @@ void GroupsStrip::fireChosenGroup() {
 
 } // namespace
 
+const QString &PremiumGroupFakeEmoticon() {
+	static const auto result = u"*premium"_q;
+	return result;
+}
+
 SearchWithGroups::SearchWithGroups(
 	QWidget *parent,
 	SearchDescriptor descriptor)
@@ -359,7 +364,9 @@ void SearchWithGroups::initGroups() {
 	widget->chosen(
 	) | rpl::start_with_next([=](const GroupsStrip::Chosen &chosen) {
 		_chosenGroup = chosen.group->iconId;
-		_query = chosen.group->emoticons;
+		_query = (chosen.group->type == EmojiGroupType::Premium)
+			? std::vector{ PremiumGroupFakeEmoticon() }
+			: chosen.group->emoticons;
 		_debouncedQuery = chosen.group->emoticons;
 		_debounceTimer.cancel();
 		scrollGroupsToIcon(chosen.iconLeft, chosen.iconRight);
diff --git a/Telegram/SourceFiles/ui/controls/tabbed_search.h b/Telegram/SourceFiles/ui/controls/tabbed_search.h
index 000cbccea1765..2a5d67e40e8d2 100644
--- a/Telegram/SourceFiles/ui/controls/tabbed_search.h
+++ b/Telegram/SourceFiles/ui/controls/tabbed_search.h
@@ -31,15 +31,24 @@ class RpWidget;
 template <typename Widget>
 class FadeWrap;
 
+enum class EmojiGroupType {
+	Normal,
+	Greeting,
+	Premium,
+};
+
 struct EmojiGroup {
 	QString iconId;
 	std::vector<QString> emoticons;
+	EmojiGroupType type = EmojiGroupType::Normal;
 
 	friend inline auto operator<=>(
 		const EmojiGroup &a,
 		const EmojiGroup &b) = default;
 };
 
+[[nodiscard]] const QString &PremiumGroupFakeEmoticon();
+
 struct SearchDescriptor {
 	const style::TabbedSearch &st;
 	rpl::producer<std::vector<EmojiGroup>> groups;

From 16ce5ef046521bbbdb8e7def1f91379b6378520b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 12:47:12 +0400
Subject: [PATCH 013/400] Greeting category first in ChatIntro setup.

---
 .../chat_helpers/stickers_list_widget.cpp     |  2 ++
 .../chat_helpers/stickers_list_widget.h       |  1 +
 .../chat_helpers/tabbed_selector.cpp          | 27 ++++++++++++++++---
 .../chat_helpers/tabbed_selector.h            |  2 ++
 .../settings/business/settings_chat_intro.cpp |  2 +-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 07a02caa92b4c..e44b8aaefee16 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -2619,6 +2619,8 @@ void StickersListWidget::setupSearch() {
 	const auto session = &_show->session();
 	const auto type = (_mode == Mode::UserpicBuilder)
 		? TabbedSearchType::ProfilePhoto
+		: (_mode == Mode::ChatIntro)
+		? TabbedSearchType::Greeting
 		: TabbedSearchType::Stickers;
 	_search = MakeSearch(this, st(), [=](std::vector<QString> &&query) {
 		auto set = base::flat_set<EmojiPtr>();
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index 2e1ef9c1cdf53..aff2cf287ef93 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -65,6 +65,7 @@ enum class StickersListMode {
 	Full,
 	Masks,
 	UserpicBuilder,
+	ChatIntro,
 };
 
 struct StickersListDescriptor {
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 7f8a915c7d55e..7de254badbebc 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -302,6 +302,21 @@ void TabbedSelector::Tab::saveScrollTop() {
 	_scrollTop = widget()->getVisibleTop();
 }
 
+[[nodiscard]] rpl::producer<std::vector<Ui::EmojiGroup>> GreetingGroupFirst(
+		not_null<Data::Session*> owner) {
+	return owner->emojiStatuses().stickerGroupsValue(
+	) | rpl::map([](std::vector<Ui::EmojiGroup> &&groups) {
+		const auto i = ranges::find(
+			groups,
+			Ui::EmojiGroupType::Greeting,
+			&Ui::EmojiGroup::type);
+		if (i != begin(groups) && i != end(groups)) {
+			ranges::rotate(begin(groups), i, i + 1);
+		}
+		return std::move(groups);
+	});
+}
+
 std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 		not_null<Ui::RpWidget*> parent,
 		const style::EmojiPan &st,
@@ -318,6 +333,8 @@ std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 			? owner->emojiStatuses().statusGroupsValue()
 			: (type == TabbedSearchType::Stickers)
 			? owner->emojiStatuses().stickerGroupsValue()
+			: (type == TabbedSearchType::Greeting)
+			? GreetingGroupFirst(owner)
 			: owner->emojiStatuses().emojiGroupsValue()),
 		.customEmojiFactory = owner->customEmojiManager().factory(
 			Data::CustomEmojiManager::SizeTag::SetIcon,
@@ -379,7 +396,7 @@ TabbedSelector::TabbedSelector(
 		tabs.reserve(2);
 		tabs.push_back(createTab(SelectorTab::Stickers, 0));
 		tabs.push_back(createTab(SelectorTab::Masks, 1));
-	} else if (_mode == Mode::StickersOnly) {
+	} else if (_mode == Mode::StickersOnly || _mode == Mode::ChatIntro) {
 		tabs.reserve(1);
 		tabs.push_back(createTab(SelectorTab::Stickers, 0));
 	} else {
@@ -390,7 +407,9 @@ TabbedSelector::TabbedSelector(
 }())
 , _currentTabType(full()
 	? session().settings().selectorTab()
-	: (mediaEditor() || _mode == Mode::StickersOnly)
+	: (mediaEditor()
+		|| _mode == Mode::StickersOnly
+		|| _mode == Mode::ChatIntro)
 	? SelectorTab::Stickers
 	: SelectorTab::Emoji)
 , _hasEmojiTab(ranges::contains(_tabs, SelectorTab::Emoji, &Tab::type))
@@ -555,7 +574,9 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 			using Descriptor = StickersListDescriptor;
 			return object_ptr<StickersListWidget>(this, Descriptor{
 				.show = _show,
-				.mode = StickersMode::Full,
+				.mode = (_mode == Mode::ChatIntro
+					? StickersMode::ChatIntro
+					: StickersMode::Full),
 				.paused = paused,
 				.st = &_st,
 				.features = _features,
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index f663d470a4d64..b9b03b33b3313 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -87,6 +87,7 @@ enum class TabbedSelectorMode {
 	FullReactions,
 	RecentReactions,
 	PeerTitle,
+	ChatIntro,
 };
 
 struct TabbedSelectorDescriptor {
@@ -103,6 +104,7 @@ enum class TabbedSearchType {
 	Status,
 	ProfilePhoto,
 	Stickers,
+	Greeting,
 };
 [[nodiscard]] std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 	not_null<Ui::RpWidget*> parent,
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 7bd61ca9032fc..b8a7607f62d42 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -476,7 +476,7 @@ void StickerPanel::create(const Descriptor &descriptor) {
 				.show = controller->uiShow(),
 				.st = st::backgroundEmojiPan,
 				.level = Window::GifPauseReason::Layer,
-				.mode = Mode::StickersOnly,
+				.mode = Mode::ChatIntro,
 				.features = {
 					.megagroupSet = false,
 					.stickersSettings = false,

From bc649af941e1d2824eff5c95ceac87a84c566737 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 28 Apr 2024 22:42:48 +0400
Subject: [PATCH 014/400] Schedule no-response action runs at different times

To avoid rate limits
---
 .../{no-response.yml => cant-reproduce.yml}   | 25 ++-----------------
 .github/workflows/needs-user-action.yml       | 16 ++++++++++++
 .github/workflows/waiting-for-answer.yml      | 16 ++++++++++++
 3 files changed, 34 insertions(+), 23 deletions(-)
 rename .github/workflows/{no-response.yml => cant-reproduce.yml} (57%)
 create mode 100644 .github/workflows/needs-user-action.yml
 create mode 100644 .github/workflows/waiting-for-answer.yml

diff --git a/.github/workflows/no-response.yml b/.github/workflows/cant-reproduce.yml
similarity index 57%
rename from .github/workflows/no-response.yml
rename to .github/workflows/cant-reproduce.yml
index f414a55fd6c58..5c4edcba0fb0c 100644
--- a/.github/workflows/no-response.yml
+++ b/.github/workflows/cant-reproduce.yml
@@ -1,32 +1,11 @@
-name: No Response
+name: Can't reproduce.
 
-# Both `issue_comment` and `scheduled` event types are required for this Action
-# to work properly.
 on:
-  issue_comment:
-    types: [created]
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 3 * * *'
 
 jobs:
-  waiting-for-answer:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lee-dohm/no-response@v0.5.0
-        with:
-          token: ${{ github.token }}
-          responseRequiredLabel: waiting for answer
-
-  needs-user-action:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lee-dohm/no-response@v0.5.0
-        with:
-          token: ${{ github.token }}
-          responseRequiredLabel: needs user action
-
   cant-reproduce:
-    if: github.event_name != 'issue_comment'
     runs-on: ubuntu-latest
     steps:
       - uses: lee-dohm/no-response@v0.5.0
diff --git a/.github/workflows/needs-user-action.yml b/.github/workflows/needs-user-action.yml
new file mode 100644
index 0000000000000..46ad9f87d82d1
--- /dev/null
+++ b/.github/workflows/needs-user-action.yml
@@ -0,0 +1,16 @@
+name: Needs user action.
+
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    - cron: '0 2 * * *'
+
+jobs:
+  needs-user-action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/no-response@v0.5.0
+        with:
+          token: ${{ github.token }}
+          responseRequiredLabel: needs user action
diff --git a/.github/workflows/waiting-for-answer.yml b/.github/workflows/waiting-for-answer.yml
new file mode 100644
index 0000000000000..657c45e92f757
--- /dev/null
+++ b/.github/workflows/waiting-for-answer.yml
@@ -0,0 +1,16 @@
+name: Waiting for answer.
+
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  waiting-for-answer:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/no-response@v0.5.0
+        with:
+          token: ${{ github.token }}
+          responseRequiredLabel: waiting for answer

From 6fa0afff377a9360479ea469b4658870296c12fb Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Wed, 1 May 2024 00:24:16 +0000
Subject: [PATCH 015/400] Update User-Agent for DNS to Chrome 124.0.0.0.

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

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

From 9166a1c3a6e48ac09691eadb30475285ff6d3fb6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 12:56:57 +0400
Subject: [PATCH 016/400] Update Linux Qt patches. Hope fixes crashes.

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 2333305d7301f..f6e4335350c86 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin f81dfc6f7061d7f70c7e952cee9c1c2689f937a2 \
+	&& git fetch --depth=1 origin ce5098d9bd638ec264fd8cf69ef3ef31d8139d18 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ee538420ac78d..41559536c8519 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -171,7 +171,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: f81dfc6f7061d7f70c7e952cee9c1c2689f937a2
+    source-commit: ce5098d9bd638ec264fd8cf69ef3ef31d8139d18
     plugin: dump
     override-pull: |
       craftctl default

From 32483fa13b46ba593fc7a302973878615428c4d1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 12:57:47 +0400
Subject: [PATCH 017/400] Just focus the search field on Space.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 13b83753c315d..30848c491d232 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3270,7 +3270,9 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		// query while still show _suggestions animated, if it is a space.
 		_postponeProcessSearchFocusChange = true;
 		_search->setFocusFast();
-		QCoreApplication::sendEvent(_search->rawTextEdit(), e);
+		if (e->key() != Qt::Key_Space) {
+			QCoreApplication::sendEvent(_search->rawTextEdit(), e);
+		}
 		_postponeProcessSearchFocusChange = false;
 		processSearchFocusChange();
 	} else {

From 3170a45158e239dc5a589c93a43a1d84c169f5b4 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 1 May 2024 14:03:30 +0400
Subject: [PATCH 018/400] Increase snapcraft verbosity

---
 .github/workflows/snap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 0c2bc4148cd49..badcf6cc9fed8 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -64,7 +64,7 @@ jobs:
         uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
 
       - name: Telegram Desktop snap build.
-        run: sg lxd -c 'snap run snapcraft -v'
+        run: sg lxd -c 'snap run snapcraft --verbosity=debug'
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'

From b3eb1dbc14f589897d2d1928f27dde92afa1ff78 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 13:31:58 +0400
Subject: [PATCH 019/400] Revert "Toggle search focus by escape."

This reverts commit 72d5a9b3e00e8f76fabbfb3e130efe371d2d5aaa.
---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 30848c491d232..b8e3ccad6934f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1795,8 +1795,6 @@ void Widget::escape() {
 			const auto first = list.empty() ? FilterId() : list.front().id();
 			if (controller()->activeChatsFilterCurrent() != first) {
 				controller()->setActiveChatsFilter(first);
-			} else {
-				_search->setFocus();
 			}
 		}
 	} else if (!_searchInChat

From a62d1dfa6361bb371d40308960c52b02a6a2c2dd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 14:36:24 +0400
Subject: [PATCH 020/400] Focus chats search by Ctrl[Cmd]+F.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index b8e3ccad6934f..6d8a226b472b2 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -995,11 +995,17 @@ void Widget::setupShortcuts() {
 	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
-		if (_openedForum && !controller()->activeChatCurrent()) {
+		if (!controller()->activeChatCurrent()) {
 			request->check(Command::Search) && request->handle([=] {
-				const auto history = _openedForum->history();
-				controller()->searchInChat(history);
-				return true;
+				if (const auto forum = _openedForum) {
+					const auto history = forum->history();
+					controller()->searchInChat(history);
+					return true;
+				} else if (!_openedFolder && _search->isVisible()) {
+					_search->setFocus();
+					return true;
+				}
+				return false;
 			});
 		}
 	}, lifetime());

From 7e071c770f7691ffdbbbd38ac3e17c9aae4d21b3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 14:37:52 +0400
Subject: [PATCH 021/400] Fix possible crash with custom wallpapered peers.

---
 Telegram/SourceFiles/window/section_widget.cpp          | 6 ++++--
 Telegram/SourceFiles/window/window_session_controller.h | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 18f3f7d059600..ae24ad4d3e3a2 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -201,10 +201,12 @@ rpl::producer<const Data::WallPaper*> WallPaperResolved(
 		return result;
 	}
 	themes->refreshChatThemes();
-	return themes->chatThemesUpdated(
+	return rpl::single<const Data::WallPaper*>(
+		nullptr
+	) | rpl::then(themes->chatThemesUpdated(
 	) | rpl::take(1) | rpl::map([=] {
 		return fromThemes(true);
-	}) | rpl::flatten_latest();
+	}) | rpl::flatten_latest());
 }
 
 AbstractSectionWidget::AbstractSectionWidget(
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 241567b5ed28b..cf4033ce45d2c 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -700,7 +700,7 @@ class SessionController : public SessionNavigation {
 
 	rpl::event_stream<> _filtersMenuChanged;
 
-	std::shared_ptr<Ui::ChatTheme> _defaultChatTheme;
+	const std::shared_ptr<Ui::ChatTheme> _defaultChatTheme;
 	base::flat_map<CachedThemeKey, CachedTheme> _customChatThemes;
 	rpl::event_stream<std::shared_ptr<Ui::ChatTheme>> _cachedThemesStream;
 	const std::unique_ptr<Ui::ChatStyle> _chatStyle;

From ad6321d3ae57b9b4ccb41c781b037458aa9db3da Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 1 May 2024 14:09:56 +0300
Subject: [PATCH 022/400] Fixed possible crash in moderate box.

---
 .../boxes/moderate_messages_box.cpp           | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 4496ed421a07a..dbb9e7cb18dba 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -227,12 +227,12 @@ void CreateModerateMessagesBox(
 		? QMargins()
 		: QMargins(0, 0, Button::ComputeSize(users.size()).width(), 0);
 
+	const auto session = &items.front()->history()->session();
+	const auto historyPeerId = items.front()->history()->peer->id;
+
 	using Request = Fn<void(not_null<UserData*>, not_null<ChannelData*>)>;
 	const auto sequentiallyRequest = [=](Request request, Users users) {
 		constexpr auto kSmallDelayMs = 5;
-		const auto session = &items.front()->history()->session();
-		const auto history = items.front()->history();
-		const auto peerId = history->peer->id;
 		const auto userIds = ranges::views::all(
 			users
 		) | ranges::views::transform([](not_null<UserData*> user) {
@@ -243,7 +243,7 @@ void CreateModerateMessagesBox(
 		const auto timer = lifetime->make_state<base::Timer>();
 		timer->setCallback(crl::guard(session, [=] {
 			if ((*counter) < userIds.size()) {
-				const auto peer = session->data().peer(peerId);
+				const auto peer = session->data().peer(historyPeerId);
 				const auto channel = peer ? peer->asChannel() : nullptr;
 				const auto from = session->data().peer(userIds[*counter]);
 				if (const auto user = from->asUser(); channel && user) {
@@ -697,17 +697,19 @@ void CreateModerateMessagesBox(
 	}
 
 	const auto close = crl::guard(box, [=] { box->closeBox(); });
-	box->addButton(tr::lng_box_delete(), [=] {
-		confirms->fire({});
+	{
 		const auto data = &users.front()->session().data();
-		const auto ids = data->itemsToIds(items);
-		if (confirmed) {
-			confirmed();
-		}
-		data->histories().deleteMessages(ids, true);
-		data->sendHistoryChangeNotifications();
-		close();
-	});
+		const auto ids = users.front()->session().data().itemsToIds(items);
+		box->addButton(tr::lng_box_delete(), [=] {
+			confirms->fire({});
+			if (confirmed) {
+				confirmed();
+			}
+			data->histories().deleteMessages(ids, true);
+			data->sendHistoryChangeNotifications();
+			close();
+		});
+	}
 	box->addButton(tr::lng_cancel(), close);
 }
 

From 12a24dd473fffc48263bd786ace5d6f7e06a8968 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 15:02:35 +0400
Subject: [PATCH 023/400] Fix possible crash in common groups list.

Currently Data::Session::processChat() may change adminRights(),
that may change Data::CanSendAnyOf(peer, ...), that may lead to
Window::SessionController::updateThirdColumnToCurrentChat() call,
that destroys current third column to replace it with another one.

If common groups list was opened in the third column this will crash.

Fixes #27640.
---
 .../info_common_groups_inner_widget.cpp       | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
index 720f47eba8c36..37defed0d9a4d 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "info/common_groups/info_common_groups_inner_widget.h"
 
+#include "base/weak_ptr.h"
 #include "info/common_groups/info_common_groups_widget.h"
 #include "info/info_controller.h"
 #include "lang/lang_keys.h"
@@ -27,7 +28,9 @@ namespace {
 constexpr auto kCommonGroupsPerPage = 40;
 constexpr auto kCommonGroupsSearchAfter = 20;
 
-class ListController final : public PeerListController {
+class ListController final
+	: public PeerListController
+	, public base::has_weak_ptr {
 public:
 	ListController(
 		not_null<Controller*> controller,
@@ -108,16 +111,30 @@ void ListController::loadMoreRows() {
 			return data.vchats().v;
 		});
 		if (!chats.empty()) {
+			auto add = std::vector<not_null<PeerData*>>();
+			auto allLoaded = _allLoaded;
+			auto preloadGroupId = _preloadGroupId;
+			const auto owner = &_user->owner();
+			const auto weak = base::make_weak(this);
 			for (const auto &chat : chats) {
-				if (const auto peer = _user->owner().processChat(chat)) {
+				if (const auto peer = owner->processChat(chat)) {
 					if (!peer->migrateTo()) {
-						delegate()->peerListAppendRow(
-							createRow(peer));
+						add.push_back(peer);
 					}
-					_preloadGroupId = peer->id;
-					_allLoaded = false;
+					preloadGroupId = peer->id;
+					allLoaded = false;
 				}
 			}
+			if (!weak) {
+				return;
+			}
+			for (const auto &peer : add) {
+				if (!delegate()->peerListFindRow(peer->id.value)) {
+					delegate()->peerListAppendRow(createRow(peer));
+				}
+			}
+			_preloadGroupId = preloadGroupId;
+			_allLoaded = allLoaded;
 			delegate()->peerListRefreshRows();
 		}
 		auto fullCount = delegate()->peerListFullRowsCount();

From 47800ee02d7b4fa431b19002ad8d46c10de44c32 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 May 2024 19:09:54 +0400
Subject: [PATCH 024/400] Improve font size selection a bit.

---
 Telegram/SourceFiles/ui/boxes/choose_font_box.cpp | 1 +
 Telegram/lib_ui                                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index 9ef7e24e0d5b2..a5e8fb20325e8 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -314,6 +314,7 @@ void Selector::validateCache(Entry &row) {
 	} else if (row.paletteVersion == version) {
 		return;
 	}
+	row.paletteVersion = version;
 	row.cache.fill(Qt::transparent);
 	auto font = style::ResolveFont(row.id, 0, st::boxFontSize);
 	auto p = QPainter(&row.cache);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 08b56a17892d4..4ddff63a9b6cd 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 08b56a17892d4c9c6b7ef87fcffbb64090e9ce2a
+Subproject commit 4ddff63a9b6cd2e2787995611f1ee4b145bdb504

From 26e8c29f40de6da59ade55908a9882908fd3095c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 01:44:52 +0300
Subject: [PATCH 025/400] Moved formatting of dialog last date to td_ui.

---
 .../SourceFiles/dialogs/ui/dialogs_layout.cpp | 32 +++----------------
 .../SourceFiles/ui/text/format_values.cpp     | 18 +++++++++++
 Telegram/SourceFiles/ui/text/format_values.h  |  1 +
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
index a625d8aca2bc0..f7cbff178fe1d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
@@ -18,6 +18,7 @@ For license and copyright information please follow this link:
 #include "styles/style_window.h"
 #include "storage/localstorage.h"
 #include "ui/empty_userpic.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/unread_badge.h"
@@ -44,8 +45,6 @@ For license and copyright information please follow this link:
 namespace Dialogs::Ui {
 namespace {
 
-// Show all dates that are in the last 20 hours in time format.
-constexpr int kRecentlyInSeconds = 20 * 3600;
 const auto kPsaBadgePrefix = "cloud_lng_badge_psa_";
 
 [[nodiscard]] bool ShowUserBotIcon(not_null<UserData*> user) {
@@ -81,29 +80,6 @@ void PaintRowTopRight(
 		text);
 }
 
-void PaintRowDate(
-		QPainter &p,
-		QDateTime date,
-		QRect &rectForName,
-		const PaintContext &context) {
-	const auto now = QDateTime::currentDateTime();
-	const auto &lastTime = date;
-	const auto nowDate = now.date();
-	const auto lastDate = lastTime.date();
-
-	const auto dt = [&] {
-		if ((lastDate == nowDate)
-			|| (qAbs(lastTime.secsTo(now)) < kRecentlyInSeconds)) {
-			return QLocale().toString(lastTime.time(), QLocale::ShortFormat);
-		} else if (qAbs(lastDate.daysTo(nowDate)) < 7) {
-			return langDayOfWeek(lastDate);
-		} else {
-			return QLocale().toString(lastDate, QLocale::ShortFormat);
-		}
-	}();
-	PaintRowTopRight(p, dt, rectForName, context);
-}
-
 int PaintBadges(
 		QPainter &p,
 		const PaintContext &context,
@@ -444,7 +420,8 @@ void PaintRow(
 		|| (supportMode
 			&& entry->session().supportHelper().isOccupiedBySomeone(history))) {
 		if (!promoted) {
-			PaintRowDate(p, date, rectForName, context);
+			const auto dateString = Ui::FormatDialogsDate(date);
+			PaintRowTopRight(p, dateString, rectForName, context);
 		}
 
 		auto availableWidth = namewidth;
@@ -566,7 +543,8 @@ void PaintRow(
 		}
 	} else if (!item->isEmpty()) {
 		if ((thread || sublist) && !promoted) {
-			PaintRowDate(p, date, rectForName, context);
+			const auto dateString = Ui::FormatDialogsDate(date);
+			PaintRowTopRight(p, dateString, rectForName, context);
 		}
 
 		paintItemCallback(nameleft, namewidth);
diff --git a/Telegram/SourceFiles/ui/text/format_values.cpp b/Telegram/SourceFiles/ui/text/format_values.cpp
index 41e985723a17b..a5115acf2cb05 100644
--- a/Telegram/SourceFiles/ui/text/format_values.cpp
+++ b/Telegram/SourceFiles/ui/text/format_values.cpp
@@ -484,4 +484,22 @@ QString FormatResetCloudPasswordIn(float64 sec) {
 	return (sec >= 3600) ? FormatTTL(sec) : FormatDurationText(sec);
 }
 
+QString FormatDialogsDate(const QDateTime &lastTime) {
+	// Show all dates that are in the last 20 hours in time format.
+	constexpr int kRecentlyInSeconds = 20 * 3600;
+
+	const auto now = QDateTime::currentDateTime();
+	const auto nowDate = now.date();
+	const auto lastDate = lastTime.date();
+
+	if ((lastDate == nowDate)
+		|| (std::abs(lastTime.secsTo(now)) < kRecentlyInSeconds)) {
+		return QLocale().toString(lastTime.time(), QLocale::ShortFormat);
+	} else if (std::abs(lastDate.daysTo(nowDate)) < 7) {
+		return langDayOfWeek(lastDate);
+	} else {
+		return QLocale().toString(lastDate, QLocale::ShortFormat);
+	}
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/text/format_values.h b/Telegram/SourceFiles/ui/text/format_values.h
index d4ac31b9ead79..b73775118af27 100644
--- a/Telegram/SourceFiles/ui/text/format_values.h
+++ b/Telegram/SourceFiles/ui/text/format_values.h
@@ -31,6 +31,7 @@ inline constexpr auto FileStatusSizeFailed = 0xFFFFFFF2LL;
 [[nodiscard]] QString FormatMuteFor(float64 sec);
 [[nodiscard]] QString FormatMuteForTiny(float64 sec);
 [[nodiscard]] QString FormatResetCloudPasswordIn(float64 sec);
+[[nodiscard]] QString FormatDialogsDate(const QDateTime &lastTime);
 
 struct CurrencyRule {
 	const char *international = "";

From 6becaaa95364d25f88f4172556f3d13c31bc08c9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 01:45:02 +0300
Subject: [PATCH 026/400] Slightly improved view style of giveaway results in
 dialogs list.

---
 Telegram/SourceFiles/data/data_media_types.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 50e063da570a6..3a8dc19434af7 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -2367,9 +2367,7 @@ const GiveawayResults *MediaGiveawayResults::giveawayResults() const {
 }
 
 TextWithEntities MediaGiveawayResults::notificationText() const {
-	return {
-		.text = tr::lng_prizes_results_title(tr::now),
-	};
+	return Ui::Text::Colorized({ tr::lng_prizes_results_title(tr::now) });
 }
 
 QString MediaGiveawayResults::pinnedTextSubstring() const {

From ab85d18cc801ae572980d5825e0b6fd1ed188892 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 02:38:52 +0300
Subject: [PATCH 027/400] Added support of personal channel with message.

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

diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 04bb9b1b60ec5..329a79158ff1d 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -10,6 +10,7 @@ using "ui/basic.style";
 using "boxes/boxes.style";
 using "ui/widgets/widgets.style";
 using "ui/chat/chat.style"; // GroupCallUserpics.
+using "dialogs/dialogs.style"; // dialogsDateFont.
 
 InfoToggle {
 	color: color;
@@ -469,6 +470,24 @@ infoGroupMembersIconPosition: point(20px, 10px);
 infoChannelMembersIconPosition: point(20px, 19px);
 
 infoPersonalChannelIconPosition: point(25px, 20px);
+infoPersonalChannelNameLabel: FlatLabel(infoProfileStatus) {
+	textFg: windowBoldFg;
+	style: semiboldTextStyle;
+	maxHeight: 20px;
+}
+infoPersonalChannelDateSkip: 22px;
+infoPersonalChannelDateLabel: FlatLabel(infoProfileStatus) {
+	textFg: dialogsDateFg;
+	style: TextStyle(semiboldTextStyle) {
+		font: dialogsDateFont;
+	}
+	maxHeight: 20px;
+}
+infoPersonalChannelUserpicSkip: 3px;
+infoPersonalChannelUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(42px, 42px);
+	photoSize: 42px;
+}
 
 infoBlockHeaderLabel: FlatLabel(infoProfileStatus) {
 	textFg: windowBoldFg;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index b7a14b484b237..096e4f80253ef 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -7,66 +7,70 @@ For license and copyright information please follow this link:
 */
 #include "info/profile/info_profile_actions.h"
 
+#include "api/api_blocked_peers.h"
 #include "api/api_chat_participants.h"
+#include "apiwrap.h"
 #include "base/options.h"
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
+#include "boxes/peers/add_bot_to_chat_box.h"
+#include "boxes/peers/edit_contact_box.h"
+#include "boxes/report_messages_box.h"
+#include "boxes/share_box.h"
+#include "boxes/translate_box.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
 #include "data/business/data_business_common.h"
 #include "data/business/data_business_info.h"
-#include "data/data_peer_values.h"
-#include "data/data_session.h"
-#include "data/data_folder.h"
-#include "data/data_forum_topic.h"
-#include "data/data_channel.h"
 #include "data/data_changes.h"
+#include "data/data_channel.h"
 #include "data/data_chat.h"
+#include "data/data_folder.h"
+#include "data/data_forum_topic.h"
+#include "data/data_peer_values.h"
+#include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/notify/data_notify_settings.h"
-#include "ui/vertical_list.h"
-#include "ui/wrap/vertical_layout.h"
-#include "ui/wrap/padding_wrap.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/shadow.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/boxes/report_box.h"
-#include "ui/layers/generic_box.h"
-#include "ui/toast/toast.h"
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
-#include "ui/text/text_variant.h"
-#include "history/history_location_manager.h" // LocationClickHandler.
-#include "history/view/history_view_context_menu.h" // HistoryView::ShowReportPeerBox
-#include "boxes/peers/add_bot_to_chat_box.h"
-#include "boxes/peers/edit_contact_box.h"
-#include "boxes/report_messages_box.h"
-#include "boxes/share_box.h"
-#include "boxes/translate_box.h"
-#include "lang/lang_keys.h"
-#include "menu/menu_mute.h"
+#include "dialogs/ui/dialogs_layout.h"
+#include "dialogs/ui/dialogs_message_view.h"
 #include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_helpers.h"
+#include "history/view/history_view_context_menu.h" // HistoryView::ShowReportPeerBox
+#include "history/view/history_view_item_preview.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "info/profile/info_profile_icon.h"
 #include "info/profile/info_profile_phone_menu.h"
-#include "info/profile/info_profile_values.h"
 #include "info/profile/info_profile_text.h"
+#include "info/profile/info_profile_values.h"
 #include "info/profile/info_profile_widget.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "menu/menu_mute.h"
 #include "support/support_helper.h"
-#include "window/window_session_controller.h"
+#include "ui/boxes/report_box.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
+#include "ui/text/text_variant.h"
+#include "ui/toast/toast.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
 #include "window/window_controller.h" // Window::Controller::show.
 #include "window/window_peer_menu.h"
-#include "mainwidget.h"
-#include "mainwindow.h" // MainWindow::controller.
-#include "main/main_session.h"
-#include "core/application.h"
-#include "core/click_handler_types.h"
-#include "apiwrap.h"
-#include "api/api_blocked_peers.h"
+#include "window/window_session_controller.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
-#include "styles/style_boxes.h"
 #include "styles/style_menu_icons.h"
 
 #include <QtGui/QGuiApplication>
@@ -1228,63 +1232,250 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 		_wrap,
 		object_ptr<Ui::VerticalLayout>(_wrap));
 	const auto container = result->entity();
+	const auto window = _controller->parentController();
 
 	result->toggleOn(PersonalChannelValue(
 		user
 	) | rpl::map(rpl::mappers::_1 != nullptr));
 	result->finishAnimating();
 
-	Ui::AddDivider(container);
-
+	auto channelToggleValue = PersonalChannelValue(
+		user
+	) | rpl::map([=] { return !!user->personalChannelId(); });
 	auto channel = PersonalChannelValue(
 		user
 	) | rpl::start_spawning(result->lifetime());
-	auto text = rpl::duplicate(
-		channel
-	) | rpl::map([=](ChannelData *channel) {
-		return channel ? NameValue(channel) : rpl::single(QString());
-	}) | rpl::flatten_latest() | rpl::map([](const QString &name) {
-		return name.isEmpty() ? TextWithEntities() : Ui::Text::Link(name);
-	});
-	auto label = rpl::combine(
-		tr::lng_info_personal_channel_label(Ui::Text::WithEntities),
-		rpl::duplicate(channel)
-	) | rpl::map([](TextWithEntities &&text, ChannelData *channel) {
-		const auto count = channel ? channel->membersCount() : 0;
-		if (count > 1) {
-			text.append(
-				QString::fromUtf8(" \xE2\x80\xA2 ")
-			).append(tr::lng_chat_status_subscribers(
-				tr::now,
-				lt_count_decimal,
-				count));
-		}
-		return text;
-	});
-	auto line = CreateTextWithLabel(
-		result,
-		std::move(label),
-		std::move(text),
-		st::infoLabel,
-		st::infoLabeled,
-		st::infoProfileLabeledPadding);
-	container->add(std::move(line.wrap));
-
-	line.text->setClickHandlerFilter([
-		=,
-		window = _controller->parentController()](
-			const ClickHandlerPtr &handler,
-			Qt::MouseButton button) {
-		if (const auto channelId = user->personalChannelId()) {
-			window->showPeerInfo(peerFromChannel(channelId));
-		}
-		return false;
-	});
 
-	object_ptr<FloatingIcon>(
-		result,
-		st::infoIconMediaChannel,
-		st::infoPersonalChannelIconPosition);
+	const auto channelLabelFactory = [=](rpl::producer<ChannelData*> c) {
+		return rpl::combine(
+			tr::lng_info_personal_channel_label(Ui::Text::WithEntities),
+			std::move(c)
+		) | rpl::map([](TextWithEntities &&text, ChannelData *channel) {
+			const auto count = channel ? channel->membersCount() : 0;
+			if (count > 1) {
+				text.append(
+					QString::fromUtf8(" \xE2\x80\xA2 ")
+				).append(tr::lng_chat_status_subscribers(
+					tr::now,
+					lt_count_decimal,
+					count));
+			}
+			return text;
+		});
+	};
+
+	{
+		const auto onlyChannelWrap = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		onlyChannelWrap->toggleOn(rpl::duplicate(channelToggleValue)
+			| rpl::map(!rpl::mappers::_1));
+		onlyChannelWrap->finishAnimating();
+
+		Ui::AddDivider(onlyChannelWrap->entity());
+
+		auto text = rpl::duplicate(
+			channel
+		) | rpl::map([=](ChannelData *channel) {
+			return channel ? NameValue(channel) : rpl::single(QString());
+		}) | rpl::flatten_latest() | rpl::map([](const QString &name) {
+			return name.isEmpty() ? TextWithEntities() : Ui::Text::Link(name);
+		});
+		auto line = CreateTextWithLabel(
+			result,
+			channelLabelFactory(rpl::duplicate(channel)),
+			std::move(text),
+			st::infoLabel,
+			st::infoLabeled,
+			st::infoProfileLabeledPadding);
+		onlyChannelWrap->entity()->add(std::move(line.wrap));
+
+		line.text->setClickHandlerFilter([=](
+				const ClickHandlerPtr &handler,
+				Qt::MouseButton button) {
+			if (const auto channelId = user->personalChannelId()) {
+				window->showPeerInfo(peerFromChannel(channelId));
+			}
+			return false;
+		});
+
+		object_ptr<FloatingIcon>(
+			onlyChannelWrap,
+			st::infoIconMediaChannel,
+			st::infoPersonalChannelIconPosition);
+	}
+
+	{
+		const auto messageChannelWrap = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		messageChannelWrap->toggleOn(rpl::duplicate(channelToggleValue));
+		messageChannelWrap->finishAnimating();
+
+		const auto clear = [=] {
+			while (messageChannelWrap->entity()->count()) {
+				delete messageChannelWrap->entity()->widgetAt(0);
+			}
+		};
+
+		const auto rebuild = [=](
+				not_null<HistoryItem*> item,
+				anim::type animated) {
+			const auto &stUserpic = st::infoPersonalChannelUserpic;
+			const auto &stLabeled = st::infoProfileLabeledPadding;
+
+			messageChannelWrap->toggle(false, anim::type::instant);
+			clear();
+			Ui::AddDivider(messageChannelWrap->entity());
+			Ui::AddSkip(messageChannelWrap->entity());
+
+			const auto inner = messageChannelWrap->entity()->add(
+				object_ptr<Ui::VerticalLayout>(messageChannelWrap->entity()));
+
+			const auto line = inner->add(
+				object_ptr<Ui::FixedHeightWidget>(
+					inner,
+					stUserpic.photoSize + rect::m::sum::v(stLabeled)));
+			const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+				line,
+				item->history()->peer,
+				st::infoPersonalChannelUserpic);
+
+			userpic->moveToLeft(
+				-st::infoPersonalChannelUserpicSkip
+					+ (stLabeled.left() - stUserpic.photoSize) / 2,
+				stLabeled.top());
+			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+			const auto date = Ui::CreateChild<Ui::FlatLabel>(
+				line,
+				Ui::FormatDialogsDate(ItemDateTime(item)),
+				st::infoPersonalChannelDateLabel);
+
+			const auto name = Ui::CreateChild<Ui::FlatLabel>(
+				line,
+				NameValue(item->history()->peer),
+				st::infoPersonalChannelNameLabel);
+
+			const auto preview = Ui::CreateChild<Ui::RpWidget>(line);
+			auto &lifetime = preview->lifetime();
+			using namespace Dialogs::Ui;
+			const auto previewView = lifetime.make_state<MessageView>();
+			preview->resize(0, st::infoLabeled.style.font->height);
+			preview->paintRequest(
+			) | rpl::start_with_next([=](const QRect &rect) {
+				auto p = Painter(preview);
+				if (previewView->prepared(item, nullptr)) {
+					previewView->paint(p, preview->rect(), {
+						.st = &st::defaultDialogRow,
+						.currentBg = st::boxBg->b,
+					});
+				} else if (!previewView->dependsOn(item)) {
+					p.setPen(st::infoPersonalChannelDateLabel.textFg);
+					p.setBrush(Qt::NoBrush);
+					p.setFont(st::infoPersonalChannelDateLabel.style.font);
+					p.drawText(
+						preview->rect(),
+						tr::lng_contacts_loading(tr::now),
+						style::al_left);
+					previewView->prepare(
+						item,
+						nullptr,
+						[=] { preview->update(); },
+						{});
+					preview->update();
+				}
+			}, preview->lifetime());
+
+			line->sizeValue(
+			) | rpl::start_with_next([=](const QSize &size) {
+				const auto left = stLabeled.left();
+				const auto right = st::infoPersonalChannelDateSkip;
+				const auto top = stLabeled.top();
+				date->moveToRight(right, top);
+
+				name->resizeToWidth(size.width()
+					- left
+					- date->width()
+					- st::defaultVerticalListSkip
+					- right);
+				name->moveToLeft(left, top);
+
+				preview->resize(
+					size.width() - left - right,
+					st::infoLabeled.style.font->height);
+				preview->moveToLeft(
+					left,
+					size.height() - stLabeled.bottom() - preview->height());
+			}, preview->lifetime());
+
+			{
+				inner->add(
+					object_ptr<Ui::FlatLabel>(
+						inner,
+						channelLabelFactory(
+							rpl::single(item->history()->peer->asChannel())),
+						st::infoLabel),
+					QMargins(
+						st::infoProfileLabeledPadding.left(),
+						0,
+						st::infoProfileLabeledPadding.right(),
+						st::infoProfileLabeledPadding.bottom()));
+			}
+			{
+				const auto button = Ui::CreateChild<Ui::RippleButton>(
+					messageChannelWrap->entity(),
+					st::defaultRippleAnimation);
+				button->paintRequest(
+				) | rpl::start_with_next([=](const QRect &rect) {
+					auto p = QPainter(button);
+					button->paintRipple(p, 0, 0);
+				}, button->lifetime());
+				inner->geometryValue(
+				) | rpl::start_with_next([=](const QRect &rect) {
+					button->setGeometry(rect);
+				}, button->lifetime());
+				button->setClickedCallback([=, msg = item->fullId().msg] {
+					window->showPeerHistory(
+						item->history()->peer,
+						Window::SectionShow::Way::Forward,
+						msg);
+				});
+				button->lower();
+			}
+			inner->setAttribute(Qt::WA_TransparentForMouseEvents);
+			Ui::AddSkip(messageChannelWrap->entity());
+
+			Ui::ToggleChildrenVisibility(messageChannelWrap->entity(), true);
+			Ui::ToggleChildrenVisibility(line, true);
+			messageChannelWrap->toggle(true, animated);
+		};
+
+		rpl::duplicate(
+			channel
+		) | rpl::start_with_next([=](ChannelData *channel) {
+			clear();
+			if (!channel) {
+				return;
+			}
+			const auto id = FullMsgId(
+				channel->id,
+				user->personalChannelMessageId());
+			if (const auto item = user->session().data().message(id)) {
+				return rebuild(item, anim::type::instant);
+			}
+			user->session().api().requestMessageData(
+				channel,
+				user->personalChannelMessageId(),
+				[=] {
+					if (const auto i = user->session().data().message(id)) {
+						rebuild(i, anim::type::normal);
+					}
+				});
+		}, messageChannelWrap->lifetime());
+	}
 
 	return result;
 }

From d40951f068c80d78d915e3dba6a76e5e0950bac5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 03:37:26 +0300
Subject: [PATCH 028/400] Added ability to moderate non-users to moderation
 box.

---
 .../boxes/moderate_messages_box.cpp           | 103 +++++++++---------
 1 file changed, 54 insertions(+), 49 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index dbb9e7cb18dba..974f3bbf80824 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -46,12 +46,12 @@ For license and copyright information please follow this link:
 
 namespace {
 
-using Users = std::vector<not_null<UserData*>>;
+using Participants = std::vector<not_null<PeerData*>>;
 
 struct ModerateOptions final {
 	bool allCanBan = false;
 	bool allCanDelete = false;
-	Users users;
+	Participants participants;
 };
 
 ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
@@ -76,9 +76,9 @@ ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
 		if (!item->suggestDeleteAllReport()) {
 			result.allCanDelete = false;
 		}
-		if (const auto user = item->from()->asUser()) {
-			if (!ranges::contains(result.users, not_null{ user })) {
-				result.users.push_back(user);
+		if (const auto p = item->from()) {
+			if (!ranges::contains(result.participants, not_null{ p })) {
+				result.participants.push_back(p);
 			}
 		}
 	}
@@ -212,42 +212,45 @@ void CreateModerateMessagesBox(
 		rpl::event_stream<bool> toggleRequestsFromTop;
 		rpl::event_stream<bool> toggleRequestsFromInner;
 		rpl::event_stream<bool> checkAllRequests;
-		Fn<Users()> collectRequests;
+		Fn<Participants()> collectRequests;
 	};
-	const auto [allCanBan, allCanDelete, users] = CalculateModerateOptions(
-		items);
+	const auto [allCanBan, allCanDelete, participants]
+		= CalculateModerateOptions(items);
 	const auto inner = box->verticalLayout();
 
-	Assert(!users.empty());
+	Assert(!participants.empty());
 
 	const auto confirms = inner->lifetime().make_state<rpl::event_stream<>>();
 
-	const auto isSingle = users.size() == 1;
+	const auto isSingle = participants.size() == 1;
 	const auto buttonPadding = isSingle
 		? QMargins()
-		: QMargins(0, 0, Button::ComputeSize(users.size()).width(), 0);
+		: QMargins(0, 0, Button::ComputeSize(participants.size()).width(), 0);
 
 	const auto session = &items.front()->history()->session();
 	const auto historyPeerId = items.front()->history()->peer->id;
 
-	using Request = Fn<void(not_null<UserData*>, not_null<ChannelData*>)>;
-	const auto sequentiallyRequest = [=](Request request, Users users) {
+	using Request = Fn<void(not_null<PeerData*>, not_null<ChannelData*>)>;
+	const auto sequentiallyRequest = [=](
+			Request request,
+			Participants participants) {
 		constexpr auto kSmallDelayMs = 5;
-		const auto userIds = ranges::views::all(
-			users
-		) | ranges::views::transform([](not_null<UserData*> user) {
-			return user->id;
+		const auto participantIds = ranges::views::all(
+			participants
+		) | ranges::views::transform([](not_null<PeerData*> peer) {
+			return peer->id;
 		}) | ranges::to_vector;
 		const auto lifetime = std::make_shared<rpl::lifetime>();
 		const auto counter = lifetime->make_state<int>(0);
 		const auto timer = lifetime->make_state<base::Timer>();
 		timer->setCallback(crl::guard(session, [=] {
-			if ((*counter) < userIds.size()) {
+			if ((*counter) < participantIds.size()) {
 				const auto peer = session->data().peer(historyPeerId);
 				const auto channel = peer ? peer->asChannel() : nullptr;
-				const auto from = session->data().peer(userIds[*counter]);
-				if (const auto user = from->asUser(); channel && user) {
-					request(user, channel);
+				const auto from = session->data().peer(
+					participantIds[*counter]);
+				if (channel && from) {
+					request(from, channel);
 				}
 				(*counter)++;
 			} else {
@@ -304,7 +307,8 @@ void CreateModerateMessagesBox(
 		});
 	};
 
-	const auto createUsersList = [&](not_null<Controller*> controller) {
+	const auto createParticipantsList = [&](
+			not_null<Controller*> controller) {
 		const auto wrap = inner->add(
 			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 				inner,
@@ -322,8 +326,8 @@ void CreateModerateMessagesBox(
 		auto &lifetime = wrap->lifetime();
 		const auto clicks = lifetime.make_state<rpl::event_stream<>>();
 		const auto checkboxes = ranges::views::all(
-			users
-		) | ranges::views::transform([&](not_null<UserData*> user) {
+			participants
+		) | ranges::views::transform([&](not_null<PeerData*> peer) {
 			const auto line = container->add(
 				object_ptr<Ui::AbstractButton>(container));
 			const auto &st = st::moderateBoxUserpic;
@@ -331,11 +335,11 @@ void CreateModerateMessagesBox(
 
 			const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
 				line,
-				user,
+				peer,
 				st);
 			const auto checkbox = Ui::CreateChild<Ui::Checkbox>(
 				line,
-				user->name(),
+				peer->name(),
 				false,
 				st::defaultBoxCheckbox);
 			line->widthValue(
@@ -381,10 +385,10 @@ void CreateModerateMessagesBox(
 		}, container->lifetime());
 
 		controller->collectRequests = [=] {
-			auto result = Users();
+			auto result = Participants();
 			for (auto i = 0; i < checkboxes.size(); i++) {
 				if (checkboxes[i]->checked()) {
-					result.push_back(users[i]);
+					result.push_back(participants[i]);
 				}
 			}
 			return result;
@@ -395,12 +399,13 @@ void CreateModerateMessagesBox(
 			not_null<Ui::Checkbox*> checkbox,
 			not_null<Controller*> controller) {
 		if (isSingle) {
-			const auto user = users.front();
-			controller->collectRequests = [=] { return Users{ user }; };
+			const auto p = participants.front();
+			controller->collectRequests = [=] { return Participants{ p }; };
 			return;
 		}
-		const auto button = Ui::CreateChild<Button>(inner, users.size());
-		button->resize(Button::ComputeSize(users.size()));
+		const auto count = int(participants.size());
+		const auto button = Ui::CreateChild<Button>(inner, count);
+		button->resize(Button::ComputeSize(count));
 
 		const auto overlay = Ui::CreateChild<Ui::AbstractButton>(inner);
 
@@ -428,7 +433,7 @@ void CreateModerateMessagesBox(
 			checkbox->setChecked(!checkbox->checked());
 			controller->checkAllRequests.fire_copy(checkbox->checked());
 		});
-		createUsersList(controller);
+		createParticipantsList(controller);
 	};
 
 	Ui::AddSkip(inner);
@@ -458,20 +463,20 @@ void CreateModerateMessagesBox(
 
 		const auto ids = items.front()->from()->owner().itemsToIds(items);
 		handleConfirmation(report, controller, [=](
-				not_null<UserData*> u,
+				not_null<PeerData*> p,
 				not_null<ChannelData*> c) {
 			auto filtered = QVector<MTPint>();
 			for (const auto &id : ids) {
-				if (const auto item = u->session().data().message(id)) {
-					if (item->from()->asUser() == u) {
+				if (const auto item = p->session().data().message(id)) {
+					if (item->from() == p) {
 						filtered.push_back(MTP_int(item->fullId().msg));
 					}
 				}
 			}
-			u->session().api().request(
+			c->session().api().request(
 				MTPchannels_ReportSpam(
 					c->inputChannel,
-					u->input,
+					p->input,
 					MTP_vector<MTPint>(std::move(filtered)))
 			).send();
 		});
@@ -501,7 +506,7 @@ void CreateModerateMessagesBox(
 			tr::lng_selected_delete_sure(
 				lt_count,
 				rpl::combine(
-					MessagesCountValue(history, users.front()),
+					MessagesCountValue(history, participants.front()),
 					deleteAll->checkedValue()
 				) | rpl::map([s = items.size()](int all, bool checked) {
 					return float64((checked && all) ? all : s);
@@ -518,9 +523,9 @@ void CreateModerateMessagesBox(
 		handleSubmition(deleteAll);
 
 		handleConfirmation(deleteAll, controller, [=](
-				not_null<UserData*> u,
+				not_null<PeerData*> p,
 				not_null<ChannelData*> c) {
-			u->session().api().deleteAllFromParticipant(c, u);
+			p->session().api().deleteAllFromParticipant(c, p);
 		});
 	}
 	if (allCanBan) {
@@ -554,7 +559,7 @@ void CreateModerateMessagesBox(
 		const auto container = wrap->entity();
 		wrap->toggle(false, anim::type::instant);
 
-		const auto session = &users.front()->session();
+		const auto session = &participants.front()->session();
 		const auto emojiMargin = QMargins(
 			-st::moderateBoxExpandInnerSkip,
 			-st::moderateBoxExpandInnerSkip / 2,
@@ -664,7 +669,7 @@ void CreateModerateMessagesBox(
 				tr::lng_restrict_users_part_single_header(),
 				tr::lng_restrict_users_part_header(
 					lt_count,
-					rpl::single(users.size()) | tr::to_count())),
+					rpl::single(participants.size()) | tr::to_count())),
 			prepareFlags,
 			disabledMessages,
 			{ .isForum = peer->isForum() });
@@ -677,12 +682,12 @@ void CreateModerateMessagesBox(
 		container->add(std::move(checkboxes));
 
 		handleConfirmation(ban, controller, [=](
-				not_null<UserData*> user,
+				not_null<PeerData*> peer,
 				not_null<ChannelData*> channel) {
 			if (wrap->toggled()) {
 				Api::ChatParticipants::Restrict(
 					channel,
-					user,
+					peer,
 					ChatRestrictionsInfo(), // Unused.
 					ChatRestrictionsInfo(getRestrictions(), 0),
 					nullptr,
@@ -690,7 +695,7 @@ void CreateModerateMessagesBox(
 			} else {
 				channel->session().api().chatParticipants().kick(
 					channel,
-					user,
+					peer,
 					{ channel->restrictions(), 0 });
 			}
 		});
@@ -698,8 +703,8 @@ void CreateModerateMessagesBox(
 
 	const auto close = crl::guard(box, [=] { box->closeBox(); });
 	{
-		const auto data = &users.front()->session().data();
-		const auto ids = users.front()->session().data().itemsToIds(items);
+		const auto data = &participants.front()->session().data();
+		const auto ids = data->itemsToIds(items);
 		box->addButton(tr::lng_box_delete(), [=] {
 			confirms->fire({});
 			if (confirmed) {
@@ -716,7 +721,7 @@ void CreateModerateMessagesBox(
 bool CanCreateModerateMessagesBox(const HistoryItemsList &items) {
 	const auto options = CalculateModerateOptions(items);
 	return (options.allCanBan || options.allCanDelete)
-		&& !options.users.empty();
+		&& !options.participants.empty();
 }
 
 void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {

From 14e8b8fb915175f2d3c617f004f57ae0cc8d15e3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 04:03:43 +0300
Subject: [PATCH 029/400] Fixed spam reporting in moderation box.

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

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 974f3bbf80824..c91e3f5da5dd0 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -465,14 +465,11 @@ void CreateModerateMessagesBox(
 		handleConfirmation(report, controller, [=](
 				not_null<PeerData*> p,
 				not_null<ChannelData*> c) {
-			auto filtered = QVector<MTPint>();
-			for (const auto &id : ids) {
-				if (const auto item = p->session().data().message(id)) {
-					if (item->from() == p) {
-						filtered.push_back(MTP_int(item->fullId().msg));
-					}
-				}
-			}
+			auto filtered = ranges::views::all(
+				ids
+			) | ranges::views::transform([](const FullMsgId &id) {
+				return MTP_int(id.msg);
+			}) | ranges::to<QVector<MTPint>>();
 			c->session().api().request(
 				MTPchannels_ReportSpam(
 					c->inputChannel,

From 95ec0633ed4c40f23e49457b1889590e7a569e14 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 11:33:47 +0400
Subject: [PATCH 030/400] Use custom-adjusted font metrics for custom fonts.

Fixes #27814.
---
 Telegram/SourceFiles/core/application.cpp     |   4 +-
 .../media/player/media_player_button.cpp      |   5 +-
 .../media/player/media_player_button.h        |   2 +
 .../media/stories/media_stories_sibling.cpp   |   2 +-
 .../SourceFiles/ui/boxes/choose_font_box.cpp  | 158 +++++++-----------
 Telegram/SourceFiles/ui/chat/chat_style.cpp   |   2 +-
 Telegram/SourceFiles/ui/countryinput.cpp      |  48 ------
 Telegram/SourceFiles/ui/countryinput.h        |   1 -
 Telegram/codegen                              |   2 +-
 Telegram/lib_ui                               |   2 +-
 10 files changed, 77 insertions(+), 149 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 0e67e7179d83c..5557eb5030cf6 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -241,7 +241,7 @@ Application::~Application() {
 	_mediaControlsManager = nullptr;
 
 	Media::Player::finish(_audio.get());
-	style::stopManager();
+	style::StopManager();
 
 	Instance = nullptr;
 }
@@ -278,7 +278,7 @@ void Application::run() {
 	_translator = std::make_unique<Lang::Translator>();
 	QCoreApplication::instance()->installTranslator(_translator.get());
 
-	style::startManager(cScale());
+	style::StartManager(cScale());
 	Ui::InitTextOptions();
 	Ui::StartCachedCorners();
 	Ui::Emoji::Init();
diff --git a/Telegram/SourceFiles/media/player/media_player_button.cpp b/Telegram/SourceFiles/media/player/media_player_button.cpp
index 79691a4e7b74e..0e9ab424a4b78 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_button.cpp
@@ -269,6 +269,9 @@ SpeedButtonLayout::SpeedButtonLayout(
 , _text(SpeedText(speed))
 , _textWidth(_metrics.horizontalAdvance(_text))
 , _callback(std::move(callback)) {
+	const auto result = style::FindAdjustResult(_st.font->f);
+	_adjustedAscent = result ? result->ascent : _metrics.ascent();
+	_adjustedHeight = result ? result->height : _metrics.height();
 }
 
 void SpeedButtonLayout::setSpeed(float64 speed) {
@@ -292,7 +295,7 @@ void SpeedButtonLayout::paint(QPainter &p, bool over, bool active) {
 	p.drawText(
 		QPointF(inner.topLeft()) + QPointF(
 			(inner.width() - _textWidth) / 2.,
-			(inner.height() - _metrics.height()) / 2. + _metrics.ascent()),
+			(inner.height() - _adjustedHeight) / 2. + _adjustedAscent),
 		_text);
 }
 
diff --git a/Telegram/SourceFiles/media/player/media_player_button.h b/Telegram/SourceFiles/media/player/media_player_button.h
index ae2b9563d86f1..750b533eb6434 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.h
+++ b/Telegram/SourceFiles/media/player/media_player_button.h
@@ -69,6 +69,8 @@ class SpeedButtonLayout {
 	float64 _speed = 1.;
 
 	QFontMetricsF _metrics;
+	float64 _adjustedAscent = 0.;
+	float64 _adjustedHeight = 0.;
 
 	QString _text;
 	float64 _textWidth = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index e57825ea15bb7..74263985125b9 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -349,7 +349,7 @@ QImage Sibling::nameImage(const SiblingLayout &layout) {
 		const auto family = 0; // Default font family.
 		const auto font = style::font(
 			_nameFontSize,
-			style::internal::FontSemibold,
+			style::FontFlag::Semibold,
 			family);
 		_name.reset();
 		_nameStyle = std::make_unique<style::TextStyle>(style::TextStyle{
diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index a5e8fb20325e8..512e8a6915823 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -53,10 +53,10 @@ class PreviewPainter {
 private:
 	void layout();
 
-	void paintBubble(QPainter &p);
-	void paintContent(QPainter &p);
-	void paintReply(QPainter &p);
-	void paintMessage(QPainter &p);
+	void paintBubble(Painter &p);
+	void paintContent(Painter &p);
+	void paintReply(Painter &p);
+	void paintMessage(Painter &p);
 
 	void validateBubbleCache();
 
@@ -64,18 +64,16 @@ class PreviewPainter {
 	const style::owned_color _msgBg;
 	const style::owned_color _msgShadow;
 
-	QFont _nameFont;
-	QFontMetricsF _nameMetrics;
-	int _nameFontHeight = 0;
-	QFont _textFont;
-	QFontMetricsF _textMetrics;
-	int _textFontHeight = 0;
+	style::owned_font _nameFontOwned;
+	style::font _nameFont;
+	style::TextStyle _nameStyle;
+	style::owned_font _textFontOwned;
+	style::font _textFont;
+	style::TextStyle _textStyle;
 
-	QString _nameText;
-	QString _replyText;
-	QString _messageText;
-
-	int _boundingLimit = 0;
+	Ui::Text::String _nameText;
+	Ui::Text::String _replyText;
+	Ui::Text::String _messageText;
 
 	QRect _replyRect;
 	QRect _name;
@@ -316,18 +314,18 @@ void Selector::validateCache(Entry &row) {
 	}
 	row.paletteVersion = version;
 	row.cache.fill(Qt::transparent);
-	auto font = style::ResolveFont(row.id, 0, st::boxFontSize);
+	auto owned = style::owned_font(row.id, 0, st::boxFontSize);
+	const auto font = owned.font();
 	auto p = QPainter(&row.cache);
 	p.setFont(font);
 	p.setPen(st::windowFg);
 
 	const auto textw = width() - _st.padding.left() - _st.padding.right();
-	const auto metrics = QFontMetrics(font);
-	const auto textt = (_rowHeight - metrics.height()) / 2.;
+	const auto textt = (_rowHeight - font->height) / 2.;
 	p.drawText(
 		_st.padding.left(),
-		int(base::SafeRound(textt)) + metrics.ascent(),
-		metrics.elidedText(row.text, Qt::ElideRight, textw));
+		textt + font->ascent,
+		font->elided(row.text, textw));
 }
 
 bool Selector::searching() const {
@@ -576,15 +574,15 @@ PreviewPainter::PreviewPainter(const QImage &bg, PreviewRequest request)
 : _request(request)
 , _msgBg(_request.msgBg)
 , _msgShadow(_request.msgShadow)
-, _nameFont(style::ResolveFont(
-	_request.family,
-	style::internal::FontSemibold,
-	st::fsize))
-, _nameMetrics(_nameFont)
-, _nameFontHeight(base::SafeRound(_nameMetrics.height()))
-, _textFont(style::ResolveFont(_request.family, 0, st::fsize))
-, _textMetrics(_textFont)
-, _textFontHeight(base::SafeRound(_textMetrics.height())) {
+, _nameFontOwned(_request.family, style::FontFlag::Semibold, st::fsize)
+, _nameFont(_nameFontOwned.font())
+, _nameStyle(st::semiboldTextStyle)
+, _textFontOwned(_request.family, 0, st::fsize)
+, _textFont(_textFontOwned.font())
+, _textStyle(st::defaultTextStyle) {
+	_nameStyle.font = _nameFont;
+	_textStyle.font = _textFont;
+
 	layout();
 
 	const auto ratio = style::DevicePixelRatio();
@@ -593,14 +591,14 @@ PreviewPainter::PreviewPainter(const QImage &bg, PreviewRequest request)
 		QImage::Format_ARGB32_Premultiplied);
 	_result.setDevicePixelRatio(ratio);
 
-	auto p = QPainter(&_result);
+	auto p = Painter(&_result);
 	p.drawImage(0, 0, bg);
 
 	p.translate(_bubble.topLeft());
 	paintBubble(p);
 }
 
-void PreviewPainter::paintBubble(QPainter &p) {
+void PreviewPainter::paintBubble(Painter &p) {
 	validateBubbleCache();
 	const auto bubble = QRect(QPoint(), _bubble.size());
 	const auto cornerShadow = _bubbleShadowBottomRight.size()
@@ -636,7 +634,7 @@ void PreviewPainter::validateBubbleCache() {
 		= Ui::PrepareCornerPixmaps(radius, _msgShadow.color()).p[3];
 }
 
-void PreviewPainter::paintContent(QPainter &p) {
+void PreviewPainter::paintContent(Painter &p) {
 	paintReply(p);
 
 	p.translate(_message.topLeft());
@@ -645,7 +643,7 @@ void PreviewPainter::paintContent(QPainter &p) {
 	paintMessage(p);
 }
 
-void PreviewPainter::paintReply(QPainter &p) {
+void PreviewPainter::paintReply(Painter &p) {
 	{
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
@@ -672,26 +670,25 @@ void PreviewPainter::paintReply(QPainter &p) {
 	p.setClipping(false);
 
 	p.setPen(_request.replyNameFg);
-	p.setFont(_nameFont);
-	const auto name = _nameMetrics.elidedText(
-		_nameText,
-		Qt::ElideRight,
-		_name.width());
-	p.drawText(_name.x(), _name.y() + _nameMetrics.ascent(), name);
+	_nameText.drawLeftElided(
+		p,
+		_name.x(),
+		_name.y(),
+		_name.width(),
+		_outer.width());
 
 	p.setPen(_request.textFg);
-	p.setFont(_textFont);
-	const auto reply = _textMetrics.elidedText(
-		_replyText,
-		Qt::ElideRight,
-		_reply.width());
-	p.drawText(_reply.x(), _reply.y() + _textMetrics.ascent(), reply);
+	_replyText.drawLeftElided(
+		p,
+		_reply.x(),
+		_reply.y(),
+		_reply.width(),
+		_outer.width());
 }
 
-void PreviewPainter::paintMessage(QPainter &p) {
+void PreviewPainter::paintMessage(Painter &p) {
 	p.setPen(_request.textFg);
-	p.setFont(_textFont);
-	p.drawText(QRect(0, 0, _message.width(), _boundingLimit), _messageText);
+	_messageText.drawLeft(p, 0, 0, _message.width(), _message.width());
 }
 
 QImage PreviewPainter::takeResult() {
@@ -705,79 +702,54 @@ void PreviewPainter::layout() {
 		- 2 * skip
 		- st::msgPadding.left()
 		- st::msgPadding.right();
-	_boundingLimit = 100 * maxTextWidth;
-
-	const auto textSize = [&](
-			const QFontMetricsF &metrics,
-			const QString &text,
-			int availableWidth,
-			bool oneline = false) {
-		const auto result = metrics.boundingRect(
-			QRect(0, 0, availableWidth, _boundingLimit),
-			(Qt::AlignLeft
-				| Qt::AlignTop
-				| (oneline ? Qt::TextSingleLine : Qt::TextWordWrap)),
-			text);
-		return QSize(
-			int(std::ceil(result.x() + result.width())),
-			int(std::ceil(result.y() + result.height())));
-	};
-	const auto naturalSize = [&](
-			const QFontMetricsF &metrics,
-			const QString &text,
-			bool oneline = false) {
-		return textSize(metrics, text, _boundingLimit, oneline);
-	};
-
-	_nameText = tr::lng_settings_chat_message_reply_from(tr::now);
-	_replyText = tr::lng_background_text2(tr::now);
-	_messageText = tr::lng_background_text1(tr::now);
 
-	const auto nameSize = naturalSize(_nameMetrics, _nameText, true);
-	const auto nameMaxWidth = nameSize.width();
-	const auto replySize = naturalSize(_textMetrics, _replyText, true);
-	const auto replyMaxWidth = replySize.width();
-	const auto messageSize = naturalSize(_textMetrics, _messageText);
-	const auto messageMaxWidth = messageSize.width();
+	_nameText = Ui::Text::String(
+		_nameStyle,
+		tr::lng_settings_chat_message_reply_from(tr::now));
+	_replyText = Ui::Text::String(
+		_textStyle,
+		tr::lng_background_text2(tr::now));
+	_messageText = Ui::Text::String(
+		_textStyle,
+		tr::lng_background_text1(tr::now),
+		kDefaultTextOptions,
+		st::msgMinWidth / 2);
 
 	const auto namePosition = QPoint(
 		st::historyReplyPadding.left(),
 		st::historyReplyPadding.top());
 	const auto replyPosition = QPoint(
 		st::historyReplyPadding.left(),
-		(st::historyReplyPadding.top() + _nameFontHeight));
+		(st::historyReplyPadding.top() + _nameFont->height));
 	const auto paddingRight = st::historyReplyPadding.right();
 
 	const auto wantedWidth = std::max({
-		namePosition.x() + nameMaxWidth + paddingRight,
-		replyPosition.x() + replyMaxWidth + paddingRight,
-		messageMaxWidth
+		namePosition.x() + _nameText.maxWidth() + paddingRight,
+		replyPosition.x() + _replyText.maxWidth() + paddingRight,
+		_messageText.maxWidth()
 	});
 
 	const auto messageWidth = std::clamp(
 		wantedWidth,
 		minTextWidth,
 		maxTextWidth);
-	const auto messageHeight = textSize(
-		_textMetrics,
-		_messageText,
-		maxTextWidth).height();
+	const auto messageHeight = _messageText.countHeight(messageWidth);
 
 	_replyRect = QRect(
 		st::msgReplyBarPos.x(),
 		st::historyReplyTop,
 		messageWidth,
 		(st::historyReplyPadding.top()
-			+ _nameFontHeight
-			+ _textFontHeight
+			+ _nameFont->height
+			+ _textFont->height
 			+ st::historyReplyPadding.bottom()));
 
 	_name = QRect(
 		_replyRect.topLeft() + namePosition,
-		QSize(messageWidth - namePosition.x(), _nameFontHeight));
+		QSize(messageWidth - namePosition.x(), _nameFont->height));
 	_reply = QRect(
 		_replyRect.topLeft() + replyPosition,
-		QSize(messageWidth - replyPosition.x(), _textFontHeight));
+		QSize(messageWidth - replyPosition.x(), _textFont->height));
 	_message = QRect(0, 0, messageWidth, messageHeight);
 
 	const auto replySkip = _replyRect.y()
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index a532a31805dcb..56f236481f11e 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -649,7 +649,7 @@ void ChatStyle::clearColorIndexCaches() {
 
 void ChatStyle::assignPalette(not_null<const style::palette*> palette) {
 	*static_cast<style::palette*>(this) = *palette;
-	style::internal::resetIcons();
+	style::internal::ResetIcons();
 
 	clearColorIndexCaches();
 	for (auto &style : _messageStyles) {
diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
index 00215910097ea..a9c9e1add1e67 100644
--- a/Telegram/SourceFiles/ui/countryinput.cpp
+++ b/Telegram/SourceFiles/ui/countryinput.cpp
@@ -29,18 +29,6 @@ CountryInput::CountryInput(
 , _st(st)
 , _text(tr::lng_country_code(tr::now)) {
 	resize(_st.width, _st.heightMin);
-
-	auto placeholderFont = _st.placeholderFont->f;
-	placeholderFont.setStyleStrategy(QFont::PreferMatch);
-	//auto metrics = QFontMetrics(placeholderFont);
-	auto placeholder = QString();// metrics.elidedText(tr::lng_country_fake_ph(tr::now), Qt::ElideRight, availableWidth);
-	if (!placeholder.isNull()) {
-		_placeholderPath.addText(
-			0,
-			QFontMetrics(placeholderFont).ascent(),
-			placeholderFont,
-			placeholder);
-	}
 }
 
 void CountryInput::paintEvent(QPaintEvent *e) {
@@ -70,42 +58,6 @@ void CountryInput::paintEvent(QPaintEvent *e) {
 	p.setFont(_st.font);
 	p.setPen(_st.textFg);
 	p.drawText(rect().marginsRemoved(_st.textMargins), _text, _st.textAlign);
-	if (!_placeholderPath.isEmpty()) {
-		auto placeholderShiftDegree = 1.;
-		p.save();
-		p.setClipRect(r);
-
-		const auto placeholderTop = anim::interpolate(
-			0,
-			_st.placeholderShift,
-			placeholderShiftDegree);
-
-		auto r = QRect(rect() - (_st.textMargins + _st.placeholderMargins));
-		r.moveTop(r.top() + placeholderTop);
-		if (rtl()) {
-			r.moveLeft(width() - r.left() - r.width());
-		}
-
-		const auto placeholderScale = 1.
-			- (1. - _st.placeholderScale) * placeholderShiftDegree;
-		auto placeholderFg = anim::color(
-			_st.placeholderFg,
-			_st.placeholderFgActive,
-			0.);
-		placeholderFg = anim::color(
-			placeholderFg,
-			_st.placeholderFgError,
-			0.);
-
-		PainterHighQualityEnabler hq(p);
-		p.setPen(Qt::NoPen);
-		p.setBrush(placeholderFg);
-		p.translate(r.topLeft());
-		p.scale(placeholderScale, placeholderScale);
-		p.drawPath(_placeholderPath);
-
-		p.restore();
-	}
 }
 
 void CountryInput::mouseMoveEvent(QMouseEvent *e) {
diff --git a/Telegram/SourceFiles/ui/countryinput.h b/Telegram/SourceFiles/ui/countryinput.h
index 7bf3f97966bb1..3ce0f04c6c079 100644
--- a/Telegram/SourceFiles/ui/countryinput.h
+++ b/Telegram/SourceFiles/ui/countryinput.h
@@ -53,7 +53,6 @@ class CountryInput : public Ui::RpWidget {
 	bool _active = false;
 	QString _text;
 	QString _chosenIso;
-	QPainterPath _placeholderPath;
 
 	rpl::event_stream<QString> _codeChanged;
 
diff --git a/Telegram/codegen b/Telegram/codegen
index afed06a4c04d1..6462cda46ec5d 160000
--- a/Telegram/codegen
+++ b/Telegram/codegen
@@ -1 +1 @@
-Subproject commit afed06a4c04d1a1cf7cfce4faca273e1f574462e
+Subproject commit 6462cda46ec5d48a9ae452ba1b6f7dfe1b6d882d
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 4ddff63a9b6cd..86dc01e9bc61d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 4ddff63a9b6cd2e2787995611f1ee4b145bdb504
+Subproject commit 86dc01e9bc61db48d33ff253d29bfedd74309278

From 2e7142742750c9add54057ae40b338184dde6c27 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 12:05:46 +0400
Subject: [PATCH 031/400] Improve font size edge cases.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 86dc01e9bc61d..d703a804dfcfe 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 86dc01e9bc61db48d33ff253d29bfedd74309278
+Subproject commit d703a804dfcfeb8bd1687b497726804708dc767f

From 641e74763fef10d583a8f5329f06a996d5a2a417 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 12:17:53 +0400
Subject: [PATCH 032/400] Revert non-production-ready prepare.py changes.

Accidentally commited in b9b7d9e337.
---
 Telegram/build/prepare/prepare.py | 76 ++++---------------------------
 1 file changed, 8 insertions(+), 68 deletions(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 6351f95c6ab2c..ce00e278ef620 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1510,82 +1510,22 @@ def runStages():
 """)
 
 if buildQt6:
-    qt6version = '6.2.8' if mac else '6.7.0'
-    qt6version_ = '6_2_8' if mac else '6_7_0'
-    arg0 = 'qt_' + qt6version_
-    arg1 = qt6version
-
-    stage('qt_' + qt6version_, """
-win:
-    git clone -b v{1} https://github.com/qt/qt5.git {0}
+    stage('qt_6_2_8', """
 mac:
-    git clone -b v{1}-lts-lgpl https://github.com/qt/qt5.git {0}
-common:
-    cd {0}
+    git clone -b v6.2.8-lts-lgpl https://github.com/qt/qt5.git qt_6_2_8
+    cd qt_6_2_8
     git submodule update --init --recursive qtbase qtimageformats qtsvg
-depends:patches/qtbase_{1}/*.patch
+depends:patches/qtbase_6.2.8/*.patch
     cd qtbase
-win:
-    for /r %%i in (..\\..\\patches\\qtbase_{1}\\*) do git apply %%i -v
-    cd ..
-
-    SET CONFIGURATIONS=-debug
-release:
-    SET CONFIGURATIONS=-debug-and-release
-win:
-    """.format(arg0, arg1) + removeDir("\"%LIBS_DIR%\\Qt-\"" + qt6version) + """
-    SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
-    SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
-    SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
-    SET OPENSSL_DIR=%LIBS_DIR%\\openssl3
-    SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
-    SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
-    SET WEBP_DIR=%LIBS_DIR%\\libwebp
-    configure -prefix "%LIBS_DIR%\\Qt-{1}" ^
-        %CONFIGURATIONS% ^
-        -force-debug-info ^
-        -opensource ^
-        -confirm-license ^
-        -static ^
-        -static-runtime ^
-        -opengl es2 -no-angle ^
-        -I "%ANGLE_DIR%\\include" ^
-        -D "KHRONOS_STATIC=" ^
-        -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^
-        QMAKE_LIBS_OPENGL_ES2_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib d3d9.lib dxgi.lib dxguid.lib" ^
-        QMAKE_LIBS_OPENGL_ES2_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib d3d9.lib dxgi.lib dxguid.lib" ^
-        -egl ^
-        QMAKE_LIBS_EGL_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
-        QMAKE_LIBS_EGL_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
-        -openssl-linked ^
-        -I "%OPENSSL_DIR%\\include" ^
-        OPENSSL_LIBS_DEBUG="%OPENSSL_LIBS_DIR%.dbg\\libssl.lib %OPENSSL_LIBS_DIR%.dbg\\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
-        OPENSSL_LIBS_RELEASE="%OPENSSL_LIBS_DIR%\\libssl.lib %OPENSSL_LIBS_DIR%\\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
-        -I "%MOZJPEG_DIR%" ^
-        LIBJPEG_LIBS_DEBUG="%MOZJPEG_DIR%\\Debug\\jpeg-static.lib" ^
-        LIBJPEG_LIBS_RELEASE="%MOZJPEG_DIR%\\Release\\jpeg-static.lib" ^
-        -system-webp ^
-        -I "%WEBP_DIR%\\src" ^
-        -L "%WEBP_DIR%\\out\\release-static\\$X8664\\lib" ^
-        -mp ^
-        -no-feature-netlistmgr ^
-        -nomake examples ^
-        -nomake tests ^
-        -platform win32-msvc
-
-    jom -j%NUMBER_OF_PROCESSORS%
-    jom -j%NUMBER_OF_PROCESSORS% install
-
-mac:
-    find ../../patches/qtbase_{1} -type f -print0 | sort -z | xargs -0 git apply -v
+    find ../../patches/qtbase_6.2.8 -type f -print0 | sort -z | xargs -0 git apply -v
     cd ..
-    sed -i.bak 's/tqtc-//' {{qtimageformats,qtsvg}}/dependencies.yaml
+    sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
 
     CONFIGURATIONS=-debug
 release:
     CONFIGURATIONS=-debug-and-release
 mac:
-    ./configure -prefix "$USED_PREFIX/Qt-{1}" \
+    ./configure -prefix "$USED_PREFIX/Qt-6.2.8" \
         $CONFIGURATIONS \
         -force-debug-info \
         -opensource \
@@ -1606,7 +1546,7 @@ def runStages():
 
     ninja
     ninja install
-""".format(arg0, arg1))
+""")
 
 stage('tg_owt', """
     git clone https://github.com/desktop-app/tg_owt.git

From 9c77346f3692c1fac023fc99704b3a76d21bd347 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 12:54:20 +0400
Subject: [PATCH 033/400] Fix build with Xcode and GCC.

---
 Telegram/SourceFiles/boxes/moderate_messages_box.cpp | 2 +-
 Telegram/SourceFiles/data/stickers/data_stickers.cpp | 3 ---
 Telegram/SourceFiles/history/history_item.cpp        | 1 -
 Telegram/lib_ui                                      | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index c91e3f5da5dd0..0e9ccab9e1cc4 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -764,7 +764,7 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 			? tr::lng_saved_messages() | Ui::Text::ToBold()
 			: maybeUser
 			? tr::lng_profile_delete_conversation() | Ui::Text::ToBold()
-			: rpl::single(Ui::Text::Bold(peer->name())),
+			: rpl::single(Ui::Text::Bold(peer->name())) | rpl::type_erased(),
 		box->getDelegate()->style().title);
 	line->widthValue(
 	) | rpl::start_with_next([=](int width) {
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index 057e1d8cf3004..9ed24fb381321 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -1172,9 +1172,6 @@ std::vector<not_null<DocumentData*>> Stickers::getPremiumList(uint64 seed) {
 	const auto CreateFeaturedSortKey = [&](not_null<DocumentData*> document) {
 		return CreateSortKey(document, kSlice * 2);
 	};
-	const auto CreateOtherSortKey = [&](not_null<DocumentData*> document) {
-		return CreateSortKey(document, 0);
-	};
 	const auto InstallDateAdjusted = [&](
 			TimeId date,
 			not_null<DocumentData*> document) {
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 171480ab60a9c..2c20bcec0ba30 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -224,7 +224,6 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 			return nullptr;
 		});
 	}, [&](const MTPDmessageMediaGeoLive &media) -> Result {
-		const auto period = media.vperiod().v;
 		return media.vgeo().match([&](const MTPDgeoPoint &point) -> Result {
 			return std::make_unique<Data::MediaLocation>(
 				item,
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d703a804dfcfe..6e924177b7ccf 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d703a804dfcfeb8bd1687b497726804708dc767f
+Subproject commit 6e924177b7ccf690ab6aeb7c5c4b462f59c84414

From fd633ecb49763fe8f6cae56992cb115ea9d4a211 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 12:11:56 +0400
Subject: [PATCH 034/400] Version 5.0.

- Choose custom font family in Settings > Chat settings > Font family.
- Show "Frequent contacts" when you focus the search field.
- Show "Recent chats" when you focus the search field.
- Show "Channels" list and similar channels.
- Premium users can use animated emoji in polls.
- Group admins can mass-moderate many messages.
- Fix frequent crashes on some Linux systems.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/version.h          |  6 +++---
 Telegram/build/version                       | 12 ++++++------
 changelog.txt                                | 10 ++++++++++
 6 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index adc24216c32de..5aed3135236b5 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.16.10.0" />
+    Version="5.0.0.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 07bbe91027b94..347b90da1fc89 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,16,10,0
- PRODUCTVERSION 4,16,10,0
+ FILEVERSION 5,0,0,0
+ PRODUCTVERSION 5,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.16.10.0"
+            VALUE "FileVersion", "5.0.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.10.0"
+            VALUE "ProductVersion", "5.0.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index ae524c403b8aa..db48e2cd9a10c 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,16,10,0
- PRODUCTVERSION 4,16,10,0
+ FILEVERSION 5,0,0,0
+ PRODUCTVERSION 5,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.16.10.0"
+            VALUE "FileVersion", "5.0.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.10.0"
+            VALUE "ProductVersion", "5.0.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 271c39d52b656..4bc103a2e277f 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 4016010;
-constexpr auto AppVersionStr = "4.16.10";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 5000000;
+constexpr auto AppVersionStr = "5.0";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 620dc863ca003..01ae1cbc0aa2d 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4016010
-AppVersionStrMajor 4.16
-AppVersionStrSmall 4.16.10
-AppVersionStr      4.16.10
-BetaChannel        1
+AppVersion         5000000
+AppVersionStrMajor 5.0
+AppVersionStrSmall 5.0
+AppVersionStr      5.0.0
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.16.10.beta
+AppVersionOriginal 5.0
diff --git a/changelog.txt b/changelog.txt
index 649f042f3c575..9c58b6f9377c7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,13 @@
+5.0 (02.05.24)
+
+- Choose custom font family in Settings > Chat settings > Font family.
+- Show "Frequent contacts" when you focus the search field.
+- Show "Recent chats" when you focus the search field.
+- Show "Channels" list and similar channels.
+- Premium users can use animated emoji in polls.
+- Group admins can mass-moderate many messages.
+- Fix frequent crashes on some Linux systems.
+
 4.16.10 beta (26.04.24)
 
 - Group admins can mass-moderate many messages.

From b7e52119bca57068d9d962003b954d244ecba42c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 16:35:22 +0400
Subject: [PATCH 035/400] Add .jxl to the list of image extensions.

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

diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index 7467145cf56bb..17a81e4dd505f 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -244,8 +244,8 @@ QString FileExtension(const QString &filepath) {
 
 NameType DetectNameType(const QString &filepath) {
 	static const auto kImage = SplitExtensions(u"\
-afdesign ai avif bmp dng gif heic icns ico jfif jpeg jpg jpg-large nef png \
-png-large psd raw sketch svg tga tif tiff webp"_q);
+afdesign ai avif bmp dng gif heic icns ico jfif jpeg jpg jpg-large jxl nef \
+png png-large psd raw sketch svg tga tif tiff webp"_q);
 	static const auto kVideo = SplitExtensions(u"\
 3g2 3gp 3gpp aep avi flv h264 m4s m4v mkv mov mp4 mpeg mpg ogv srt tgs tgv \
 vob webm wmv"_q);

From 2b580d29ae46873fbadfba3c03dfacc73bbc9a4f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 17:17:40 +0400
Subject: [PATCH 036/400] Add .qoi to list of image extensions.

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

diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index 17a81e4dd505f..cc1c14c845d3c 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -245,7 +245,7 @@ QString FileExtension(const QString &filepath) {
 NameType DetectNameType(const QString &filepath) {
 	static const auto kImage = SplitExtensions(u"\
 afdesign ai avif bmp dng gif heic icns ico jfif jpeg jpg jpg-large jxl nef \
-png png-large psd raw sketch svg tga tif tiff webp"_q);
+png png-large psd qoi raw sketch svg tga tif tiff webp"_q);
 	static const auto kVideo = SplitExtensions(u"\
 3g2 3gp 3gpp aep avi flv h264 m4s m4v mkv mov mp4 mpeg mpg ogv srt tgs tgv \
 vob webm wmv"_q);

From bb47f4659dd322c1e6ce32c0a4683489ccc09126 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 19:36:59 +0400
Subject: [PATCH 037/400] Don't adjust monospace font size.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 6e924177b7ccf..5b8eb3a5b8f1d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 6e924177b7ccf690ab6aeb7c5c4b462f59c84414
+Subproject commit 5b8eb3a5b8f1dfab8c7ac70b2e7294590b253db9

From 0194687181f9be9b493750886aed1823d841cf74 Mon Sep 17 00:00:00 2001
From: Alan Pope <alan@popey.com>
Date: Thu, 2 May 2024 20:59:46 +0100
Subject: [PATCH 038/400] fix: Incorrect package name

Noble has libvpx9, not vpx8.

https://packages.ubuntu.com/search?keywords=libvpx9
---
 snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 41559536c8519..46fa5e66ce2bb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -473,7 +473,7 @@ parts:
       - libopenh264-7
       - libopus0
       - libssl3
-      - libvpx8
+      - libvpx9
       - libx11-6
       - libxcomposite1
       - libxdamage1

From 2b013c108f04178c87984cd8c0e3dbae32079cae Mon Sep 17 00:00:00 2001
From: Alan Pope <alan@popey.com>
Date: Thu, 2 May 2024 23:01:50 +0100
Subject: [PATCH 039/400] Fixes for unable to find gtk-query-immodules-3.0

The package has been updated for 2038 t64 update. This fixes that.

Successfully build telegram 5.0.0 in arm64 after the fixes in this PR.
---
 snap/snapcraft.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 46fa5e66ce2bb..ecc16b482aed7 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -193,7 +193,7 @@ parts:
       - dpkg-dev
       - gtk-update-icon-cache
       - libglib2.0-bin
-      - libgtk-3-0
+      - libgtk-3-0t64
     stage-packages:
       - libc-bin
       - libgdk-pixbuf-2.0-0
@@ -211,7 +211,7 @@ parts:
           update-icon-caches "$theme"
         fi
       done
-      GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgtk-3-0/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0/3.0.0/immodules/immodules.cache
+      GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgtk-3-0t64/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0/3.0.0/immodules/immodules.cache
     after:
       - telegram
 

From e3a14d432be9c273ebd8b323babe34839d394ff7 Mon Sep 17 00:00:00 2001
From: Alan Pope <alan@popey.com>
Date: Thu, 2 May 2024 23:21:06 +0100
Subject: [PATCH 040/400] Be consistent with libgtk-3-0t64

The reason it worked without explicitly updating this one is because the deb of libgtk-3-0t64 has a 'replaces' line for libgtk-3-0 - which nullifies this entry, as both were specified. But, you're right, looks better to have the right package in there.
---
 snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ecc16b482aed7..87f926e0ed1f4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -328,7 +328,7 @@ parts:
       - libfreetype6
       - libglib2.0-0
       - libglx0
-      - libgtk-3-0
+      - libgtk-3-0t64
       - libharfbuzz0b
       - libice6
       - libicu74

From 5e1f0e9f7f5822c642dd72856cfa9b5e89f8754c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 3 May 2024 05:17:05 +0400
Subject: [PATCH 041/400] Move waiting for answer action 30 minutes later than
 lock threads

---
 .github/workflows/waiting-for-answer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/waiting-for-answer.yml b/.github/workflows/waiting-for-answer.yml
index 657c45e92f757..5e5ff87c968cd 100644
--- a/.github/workflows/waiting-for-answer.yml
+++ b/.github/workflows/waiting-for-answer.yml
@@ -4,7 +4,7 @@ on:
   issue_comment:
     types: [created]
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '30 0 * * *'
 
 jobs:
   waiting-for-answer:

From de1f222bacff5c0b100c252c183623c1ce3910d5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 2 May 2024 23:39:27 +0300
Subject: [PATCH 042/400] Fixed rescheduling of selected and grouped scheduled
 messages.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index a7a24e44bff48..bb74d73119cca 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -553,11 +553,18 @@ bool AddRescheduleAction(
 		}
 		const auto callback = [=](Api::SendOptions options) {
 			list->cancelSelection();
+			auto groupedIds = std::vector<MessageGroupId>();
 			for (const auto &id : ids) {
 				const auto item = owner->message(id);
 				if (!item || !item->isScheduled()) {
 					continue;
 				}
+				if (const auto groupId = item->groupId()) {
+					if (ranges::contains(groupedIds, groupId)) {
+						continue;
+					}
+					groupedIds.push_back(groupId);
+				}
 				Api::RescheduleMessage(item, options);
 				// Increase the scheduled date by 1s to keep the order.
 				options.scheduled += 1;

From 1709fcd0dff23b0679f9dea776ff732fe8cce4be Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 3 May 2024 17:54:51 +0300
Subject: [PATCH 043/400] Guarded personal channel info from possible crash on
 deleting message.

---
 .../info/profile/info_profile_actions.cpp          | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 096e4f80253ef..26adba1235a8a 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1365,8 +1365,20 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 			const auto previewView = lifetime.make_state<MessageView>();
 			preview->resize(0, st::infoLabeled.style.font->height);
 			preview->paintRequest(
-			) | rpl::start_with_next([=](const QRect &rect) {
+			) | rpl::start_with_next([=, fullId = item->fullId()](
+					const QRect &rect) {
 				auto p = Painter(preview);
+				const auto item = user->session().data().message(fullId);
+				if (!item) {
+					p.setPen(st::infoPersonalChannelDateLabel.textFg);
+					p.setBrush(Qt::NoBrush);
+					p.setFont(st::infoPersonalChannelDateLabel.style.font);
+					p.drawText(
+						preview->rect(),
+						tr::lng_deleted_message(tr::now),
+						style::al_left);
+					return;
+				}
 				if (previewView->prepared(item, nullptr)) {
 					previewView->paint(p, preview->rect(), {
 						.st = &st::defaultDialogRow,

From fccaa587e1ee8c9785489ff2910b485905a87785 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 11:25:21 +0400
Subject: [PATCH 044/400] Fix adjustment of size for modified fonts.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 5b8eb3a5b8f1d..db8c3d16e8371 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 5b8eb3a5b8f1dfab8c7ac70b2e7294590b253db9
+Subproject commit db8c3d16e8371bd58024970b8da793bef9d66ede

From 19ead551d93a1c5d371991ac9d52e9702a523c29 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 11:26:24 +0400
Subject: [PATCH 045/400] Fix a typo bug in replies section scrolling.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index fe9ef26e8a8b9..afd77d6657ce2 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -2385,7 +2385,7 @@ bool RepliesWidget::listScrollTo(int top, bool syntetic) {
 		updateInnerVisibleArea();
 	}
 	_synteticScrollEvent = false;
-	return syntetic;
+	return scrolled;
 }
 
 void RepliesWidget::listCancelRequest() {

From 638e88ec79e7878371aa961c18d878fdf9961a56 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 4 May 2024 07:56:25 +0400
Subject: [PATCH 046/400] Revert "Use latest mesa in snap"

This reverts commit b246328dcf96dfd44e11bef5932b8ff3d7deac5e.
---
 snap/snapcraft.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 87f926e0ed1f4..678b4d0184289 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -79,10 +79,6 @@ layout:
   /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0:
     bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0
 
-package-repositories:
-  - type: apt
-    ppa: kisak/kisak-mesa
-
 parts:
   telegram:
     plugin: cmake

From 7289292f026e222f33f62242a58b35f3bf162866 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 4 May 2024 13:01:01 +0400
Subject: [PATCH 047/400] Update lib_ui & patches on Linux

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index f6e4335350c86..350c7a3fd5621 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin ce5098d9bd638ec264fd8cf69ef3ef31d8139d18 \
+	&& git fetch --depth=1 origin 44f5103860dfa3f9b9675730231af6fbe28cde93 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index db8c3d16e8371..f76ddd841ca02 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit db8c3d16e8371bd58024970b8da793bef9d66ede
+Subproject commit f76ddd841ca02ca35432f6de569f8c430a9713b1
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 678b4d0184289..7b77617691284 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -167,7 +167,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: ce5098d9bd638ec264fd8cf69ef3ef31d8139d18
+    source-commit: 44f5103860dfa3f9b9675730231af6fbe28cde93
     plugin: dump
     override-pull: |
       craftctl default

From 129d3569099e02c790acf1f9cec13e9815b34ca8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 4 May 2024 14:36:26 +0400
Subject: [PATCH 048/400] Fix scrolling expanded frequent contacts.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp | 5 +++++
 Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp     | 4 ++++
 Telegram/SourceFiles/dialogs/ui/top_peers_strip.h       | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 9909fd036a720..50362e657a8b7 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -970,6 +970,11 @@ void Suggestions::setupChats() {
 		_chatsScroll->scrollToY(request.ymin, request.ymax);
 	}, _topPeers->lifetime());
 
+	_topPeers->verticalScrollEvents(
+	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+		_chatsScroll->viewportEvent(e);
+	}, _topPeers->lifetime());
+
 	_chatsScroll->setVisible(_tab.current() == Tab::Chats);
 }
 
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index d32d32814d318..f793da346ceab 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -205,6 +205,10 @@ int TopPeersStrip::resizeGetHeight(int newWidth) {
 	return _strip.y() + _strip.height();
 }
 
+rpl::producer<not_null<QWheelEvent*>> TopPeersStrip::verticalScrollEvents() const {
+	return _verticalScrollEvents.events();
+}
+
 void TopPeersStrip::stripWheelEvent(QWheelEvent *e) {
 	const auto phase = e->phase();
 	const auto fullDelta = e->pixelDelta().isNull()
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index f23b3da111ef4..9894235c69892 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -62,6 +62,9 @@ class TopPeersStrip final : public Ui::RpWidget {
 	void deselectByKeyboard();
 	bool chooseRow();
 
+	[[nodiscard]] auto verticalScrollEvents() const
+		-> rpl::producer<not_null<QWheelEvent*>>;
+
 private:
 	struct Entry;
 	struct Layout;

From a866ba8cddf356436e65d7f613b95b97bf614374 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 4 May 2024 13:32:07 +0300
Subject: [PATCH 049/400] Fixed crash on restricting users from moderation box.

---
 .../boxes/moderate_messages_box.cpp           | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 0e9ccab9e1cc4..22d234ef079d6 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -678,24 +678,32 @@ void CreateModerateMessagesBox(
 		Ui::AddSkip(container);
 		container->add(std::move(checkboxes));
 
-		handleConfirmation(ban, controller, [=](
-				not_null<PeerData*> peer,
-				not_null<ChannelData*> channel) {
-			if (wrap->toggled()) {
-				Api::ChatParticipants::Restrict(
-					channel,
-					peer,
-					ChatRestrictionsInfo(), // Unused.
-					ChatRestrictionsInfo(getRestrictions(), 0),
-					nullptr,
-					nullptr);
-			} else {
-				channel->session().api().chatParticipants().kick(
-					channel,
-					peer,
-					{ channel->restrictions(), 0 });
+		// Handle confirmation manually.
+		confirms->events() | rpl::start_with_next([=] {
+			if (ban->checked() && controller->collectRequests) {
+				const auto kick = !wrap->toggled();
+				const auto restrictions = getRestrictions();
+				const auto request = [=](
+						not_null<PeerData*> peer,
+						not_null<ChannelData*> channel) {
+					if (!kick) {
+						Api::ChatParticipants::Restrict(
+							channel,
+							peer,
+							ChatRestrictionsInfo(), // Unused.
+							ChatRestrictionsInfo(restrictions, 0),
+							nullptr,
+							nullptr);
+					} else {
+						channel->session().api().chatParticipants().kick(
+							channel,
+							peer,
+							{ channel->restrictions(), 0 });
+					}
+				};
+				sequentiallyRequest(request, controller->collectRequests());
 			}
-		});
+		}, ban->lifetime());
 	}
 
 	const auto close = crl::guard(box, [=] { box->closeBox(); });

From c4f0db5bc52d9d5af41dd10187fd2f11aec7540a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 4 May 2024 13:53:40 +0300
Subject: [PATCH 050/400] Fixed possible crash on slow resolving message from
 personal channel.

---
 Telegram/SourceFiles/info/profile/info_profile_actions.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 26adba1235a8a..4dbd1fd331809 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1481,11 +1481,11 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 			user->session().api().requestMessageData(
 				channel,
 				user->personalChannelMessageId(),
-				[=] {
+				crl::guard(container, [=] {
 					if (const auto i = user->session().data().message(id)) {
 						rebuild(i, anim::type::normal);
 					}
-				});
+				}));
 		}, messageChannelWrap->lifetime());
 	}
 

From fb444e7dd42985104ec416cdc3545c554694017b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 4 May 2024 19:08:30 +0400
Subject: [PATCH 051/400] Version 5.0.1.

- Fix several crashes in new interfaces.
- Fix monospace font size.
- Fix possible problem with underline font size.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 6 ++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 5aed3135236b5..0021dd5de1e77 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.0.0" />
+    Version="5.0.1.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 347b90da1fc89..73e7a40b7de5b 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,0,0
- PRODUCTVERSION 5,0,0,0
+ FILEVERSION 5,0,1,0
+ PRODUCTVERSION 5,0,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.0.0"
+            VALUE "FileVersion", "5.0.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.0.0"
+            VALUE "ProductVersion", "5.0.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index db48e2cd9a10c..50804d11627c9 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,0,0
- PRODUCTVERSION 5,0,0,0
+ FILEVERSION 5,0,1,0
+ PRODUCTVERSION 5,0,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.0.0.0"
+            VALUE "FileVersion", "5.0.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.0.0"
+            VALUE "ProductVersion", "5.0.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 4bc103a2e277f..5c6a409e87cba 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5000000;
-constexpr auto AppVersionStr = "5.0";
+constexpr auto AppVersion = 5000001;
+constexpr auto AppVersionStr = "5.0.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 01ae1cbc0aa2d..dbb89ce4f2df9 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000000
+AppVersion         5000001
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0
-AppVersionStr      5.0.0
+AppVersionStrSmall 5.0.1
+AppVersionStr      5.0.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.0
+AppVersionOriginal 5.0.1
diff --git a/changelog.txt b/changelog.txt
index 9c58b6f9377c7..432af58b0d94b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+5.0.1 (04.05.24)
+
+- Fix several crashes in new interfaces.
+- Fix monospace font size.
+- Fix possible problem with underline font size.
+
 5.0 (02.05.24)
 
 - Choose custom font family in Settings > Chat settings > Font family.

From 7ff5f81b8863506947161fee8b603bbe0f62495c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 6 May 2024 08:44:18 +0400
Subject: [PATCH 052/400] Try automatic actions update

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

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000000..5ace4600a1f26
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

From 046bc0303705780f2033f2e73e9066211d4f7e89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 05:47:20 +0000
Subject: [PATCH 053/400] Bump actions/checkout from 3.1.0 to 4.1.4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.1.0 to 4.1.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.1.0...v4.1.4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docker.yml         | 2 +-
 .github/workflows/linux.yml          | 2 +-
 .github/workflows/mac.yml            | 2 +-
 .github/workflows/mac_packaged.yml   | 2 +-
 .github/workflows/master_updater.yml | 2 +-
 .github/workflows/snap.yml           | 2 +-
 .github/workflows/win.yml            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7a65b483fb3f2..e702263451632 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           submodules: recursive
 
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 8020e46c5b735..0d772b8d7f1e4 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -58,7 +58,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 8271664c05ff4..c96a456891502 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -56,7 +56,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index d04b284dee381..fc0d5e5148343 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -60,7 +60,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
diff --git a/.github/workflows/master_updater.yml b/.github/workflows/master_updater.yml
index 284bb844e40db..a4e50c1240edc 100644
--- a/.github/workflows/master_updater.yml
+++ b/.github/workflows/master_updater.yml
@@ -11,7 +11,7 @@ jobs:
       SKIP: "0"
       to_branch: "master"
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.4
         with:
           fetch-depth: 0
         if: env.SKIP == '0'
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index badcf6cc9fed8..ae4371f0d19a1 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           fetch-depth: 0
           submodules: recursive
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index f8332c36f1b8c..d4b8ce7a82394 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -75,7 +75,7 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: Clone.
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           submodules: recursive
           path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}

From 3847b97f80ede5efd8ac2bac7fda2c312b5c7ae1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 05:47:12 +0000
Subject: [PATCH 054/400] Bump actions/cache from 3.0.11 to 4.0.2

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.11 to 4.0.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.11...v4.0.2)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/mac.yml          | 4 ++--
 .github/workflows/mac_packaged.yml | 2 +-
 .github/workflows/win.yml          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index c96a456891502..0bd06cb1fd9f1 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -76,7 +76,7 @@ jobs:
 
       - name: ThirdParty cache.
         id: cache-third-party
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v4.0.2
         with:
           path: ThirdParty
           key: ${{ runner.OS }}-third-party-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
@@ -84,7 +84,7 @@ jobs:
 
       - name: Libraries cache.
         id: cache-libs
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v4.0.2
         with:
           path: Libraries
           key: ${{ runner.OS }}-libs-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index fc0d5e5148343..7f0daf22d0312 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -99,7 +99,7 @@ jobs:
 
       - name: WebRTC cache.
         id: cache-webrtc
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v4.0.2
         with:
           path: ${{ env.LibrariesPath }}/tg_owt
           key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_owt-version.json') }}
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index d4b8ce7a82394..669ef15d433a0 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -96,7 +96,7 @@ jobs:
 
       - name: Libraries cache.
         id: cache-libs
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v4.0.2
         with:
           path: ${{ env.TBUILD }}\Libraries
           key: ${{ runner.OS }}-${{ matrix.arch }}-libs-${{ env.CACHE_KEY }}

From ddf6514a90005c2600738f8c22149fab64bc0dc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 05:47:14 +0000
Subject: [PATCH 055/400] Bump actions/stale from 5 to 9

Bumps [actions/stale](https://github.com/actions/stale) from 5 to 9.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v5...v9)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 219f95a82a44a..4148917e712d2 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v9
         with:
           stale-issue-message: |
             Hey there!

From 78a05768d83f5537c9d3e059ae766004e8284b58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 05:47:08 +0000
Subject: [PATCH 056/400] Bump dessant/lock-threads from 3 to 5

Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 3 to 5.
- [Release notes](https://github.com/dessant/lock-threads/releases)
- [Changelog](https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md)
- [Commits](https://github.com/dessant/lock-threads/compare/v3...v5)

---
updated-dependencies:
- dependency-name: dessant/lock-threads
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lock.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index 562159d0d127f..cf3c4698962ba 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -8,7 +8,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v3
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: 45

From 7e253314ecb560954d23e2e0f6c2e575e78bbb40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 16:42:41 +0000
Subject: [PATCH 057/400] Bump jinja2 from 3.1.3 to 3.1.4 in
 /Telegram/build/docker/centos_env

Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/3.1.3...3.1.4)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Telegram/build/docker/centos_env/poetry.lock    | 10 +++++-----
 Telegram/build/docker/centos_env/pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Telegram/build/docker/centos_env/poetry.lock b/Telegram/build/docker/centos_env/poetry.lock
index 08526811d446f..5ad561c716114 100644
--- a/Telegram/build/docker/centos_env/poetry.lock
+++ b/Telegram/build/docker/centos_env/poetry.lock
@@ -1,14 +1,14 @@
-# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
 [[package]]
 name = "jinja2"
-version = "3.1.3"
+version = "3.1.4"
 description = "A very fast and expressive template engine."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa"},
-    {file = "Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"},
+    {file = "jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"},
+    {file = "jinja2-3.1.4.tar.gz", hash = "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"},
 ]
 
 [package.dependencies]
@@ -69,4 +69,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.7"
-content-hash = "bac9a23a86839c72127e75f2cf181e331f59d96f723403d529e7ea19774ff9c4"
+content-hash = "dcdc36798334f1f85051cf78d7f8a7242a480509eb34135934d9f092d2da5c33"
diff --git a/Telegram/build/docker/centos_env/pyproject.toml b/Telegram/build/docker/centos_env/pyproject.toml
index bba5c212f1ee0..d20d3d1d4e244 100644
--- a/Telegram/build/docker/centos_env/pyproject.toml
+++ b/Telegram/build/docker/centos_env/pyproject.toml
@@ -6,7 +6,7 @@ authors = []
 
 [tool.poetry.dependencies]
 python = "^3.7"
-Jinja2 = "^3.1.3"
+Jinja2 = "^3.1.4"
 
 [tool.poetry.dev-dependencies]
 

From 5d622b906e63a18155f7e812609d99a1e7b877af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 05:47:17 +0000
Subject: [PATCH 058/400] Bump ilammy/msvc-dev-cmd from 1.12.0 to 1.13.0

Bumps [ilammy/msvc-dev-cmd](https://github.com/ilammy/msvc-dev-cmd) from 1.12.0 to 1.13.0.
- [Release notes](https://github.com/ilammy/msvc-dev-cmd/releases)
- [Commits](https://github.com/ilammy/msvc-dev-cmd/compare/v1.12.0...v1.13.0)

---
updated-dependencies:
- dependency-name: ilammy/msvc-dev-cmd
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/win.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 669ef15d433a0..222366c6cf3c4 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -69,7 +69,7 @@ jobs:
         shell: bash
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
-      - uses: ilammy/msvc-dev-cmd@v1.12.0
+      - uses: ilammy/msvc-dev-cmd@v1.13.0
         name: Native Tools Command Prompt.
         with:
           arch: ${{ matrix.arch }}

From 593e76479ccb6fa7299a5638b28a6e8c1f2376b1 Mon Sep 17 00:00:00 2001
From: GkvJwa <gkvjwa@gmail.com>
Date: Sat, 4 May 2024 18:56:28 +0800
Subject: [PATCH 059/400] Use jom build openssl on windows

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

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index ce00e278ef620..ce6c87b9bf1fb 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -593,25 +593,25 @@ def runStages():
     git clone -b openssl-3.2.1 https://github.com/openssl/openssl openssl3
     cd openssl3
 win32:
-    perl Configure no-shared no-tests debug-VC-WIN32
+    perl Configure no-shared no-tests debug-VC-WIN32 /FS
 win64:
-    perl Configure no-shared no-tests debug-VC-WIN64A
+    perl Configure no-shared no-tests debug-VC-WIN64A /FS
 win:
-    nmake
+    jom -j%NUMBER_OF_PROCESSORS%
     mkdir out.dbg
     move libcrypto.lib out.dbg
     move libssl.lib out.dbg
     move ossl_static.pdb out.dbg
 release:
     move out.dbg\\ossl_static.pdb out.dbg\\ossl_static
-    nmake clean
+    jom clean
     move out.dbg\\ossl_static out.dbg\\ossl_static.pdb
 win32:
-    perl Configure no-shared no-tests VC-WIN32
+    perl Configure no-shared no-tests VC-WIN32 /FS
 win64:
-    perl Configure no-shared no-tests VC-WIN64A
+    perl Configure no-shared no-tests VC-WIN64A /FS
 win:
-    nmake
+    jom -j%NUMBER_OF_PROCESSORS%
     mkdir out
     move libcrypto.lib out
     move libssl.lib out

From c1a01728226d249384a52c590fd7508ca013ed12 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 May 2024 17:07:02 +0400
Subject: [PATCH 060/400] De-focus empty search by backspace.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 6d8a226b472b2..bfa3771a67ccd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3244,6 +3244,10 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		//} else {
 		//	e->ignore();
 		//}
+	} else if (e->key() == Qt::Key_Backspace
+		&& _searchHasFocus
+		&& !_searchInChat) {
+		escape();
 	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
 		submit();
 	} else if (_suggestions

From 1f3a3ec04b54f0cc15ef8b3e8bb5b0827aa30ee7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 May 2024 20:45:55 +0400
Subject: [PATCH 061/400] Don't focus search when forum is opened.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index bfa3771a67ccd..2f17639646ea3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1001,7 +1001,9 @@ void Widget::setupShortcuts() {
 					const auto history = forum->history();
 					controller()->searchInChat(history);
 					return true;
-				} else if (!_openedFolder && _search->isVisible()) {
+				} else if (!_openedFolder
+					&& !_childList
+					&& _search->isVisible()) {
 					_search->setFocus();
 					return true;
 				}
@@ -3291,6 +3293,7 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 bool Widget::redirectKeyToSearch(QKeyEvent *e) const {
 	if (_openedFolder
 		|| _openedForum
+		|| _childList
 		|| !_search->isVisible()
 		|| _search->hasFocus()) {
 		return false;

From 2cb0651b046438cc444c9947a8cee95982e1e22f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 7 May 2024 13:18:58 +0400
Subject: [PATCH 062/400] Redirect IME to search on Windows.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 27 +++++++++++++++----
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 ++
 .../platform/win/main_window_win.cpp          | 15 +++++++++++
 .../platform/win/main_window_win.h            |  5 ++++
 Telegram/SourceFiles/window/main_window.cpp   |  8 ++++++
 Telegram/SourceFiles/window/main_window.h     |  5 +++-
 6 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 2f17639646ea3..575516ffa0284 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -356,6 +356,14 @@ Widget::Widget(
 		Ui::PostponeCall(this, [=] { listScrollUpdated(); });
 	}, lifetime());
 
+	setAttribute(Qt::WA_InputMethodEnabled);
+	controller->widget()->imeCompositionStarts(
+	) | rpl::filter([=] {
+		return redirectImeToSearch();
+	}) | rpl::start_with_next([=] {
+		_search->setFocusFast();
+	}, lifetime());
+
 	_search->changes(
 	) | rpl::start_with_next([=] {
 		applySearchUpdate();
@@ -3290,12 +3298,17 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
+bool Widget::redirectToSearchPossible() const {
+	return !_openedFolder
+		&& !_openedForum
+		&& !_childList
+		&& _search->isVisible()
+		&& !_search->hasFocus()
+		&& hasFocus();
+}
+
 bool Widget::redirectKeyToSearch(QKeyEvent *e) const {
-	if (_openedFolder
-		|| _openedForum
-		|| _childList
-		|| !_search->isVisible()
-		|| _search->hasFocus()) {
+	if (!redirectToSearchPossible()) {
 		return false;
 	}
 	const auto character = !(e->modifiers() & ~Qt::ShiftModifier)
@@ -3316,6 +3329,10 @@ bool Widget::redirectKeyToSearch(QKeyEvent *e) const {
 	return data && data->hasText();
 }
 
+bool Widget::redirectImeToSearch() const {
+	return redirectToSearchPossible();
+}
+
 void Widget::paintEvent(QPaintEvent *e) {
 	if (controller()->contentOverlapped(this, e)) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index ecd2f36087bcd..5ff9828d5aec4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -250,7 +250,9 @@ class Widget final : public Window::AbstractSectionWidget {
 	void updateSuggestions(anim::type animated);
 	void processSearchFocusChange();
 
+	[[nodiscard]] bool redirectToSearchPossible() const;
 	[[nodiscard]] bool redirectKeyToSearch(QKeyEvent *e) const;
+	[[nodiscard]] bool redirectImeToSearch() const;
 
 	MTP::Sender _api;
 
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index 8c852b837ade1..dd2f3dafec104 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -480,6 +480,21 @@ bool MainWindow::initGeometryFromSystem() {
 	return true;
 }
 
+bool MainWindow::nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		long *result) {
+	if (message) {
+		const auto msg = static_cast<MSG*>(message);
+		if (msg->message == WM_IME_STARTCOMPOSITION) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+				imeCompositionStartReceived();
+			});
+		}
+	}
+	return false;
+}
+
 void MainWindow::updateWindowIcon() {
 	updateTaskbarAndIconCounters();
 }
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.h b/Telegram/SourceFiles/platform/win/main_window_win.h
index 856bee773ef1c..63dc6ba17b237 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.h
+++ b/Telegram/SourceFiles/platform/win/main_window_win.h
@@ -48,6 +48,11 @@ class MainWindow : public Window::MainWindow {
 
 	bool initGeometryFromSystem() override;
 
+	bool nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		long *result) override;
+
 private:
 	struct Private;
 
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 3f8c9b5ba9ae3..1c5de596762e2 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -795,10 +795,18 @@ void MainWindow::setPositionInited() {
 	_positionInited = true;
 }
 
+void MainWindow::imeCompositionStartReceived() {
+	_imeCompositionStartReceived.fire({});
+}
+
 rpl::producer<> MainWindow::leaveEvents() const {
 	return _leaveEvents.events();
 }
 
+rpl::producer<> MainWindow::imeCompositionStarts() const {
+	return _imeCompositionStartReceived.events();
+}
+
 void MainWindow::leaveEventHook(QEvent *e) {
 	_leaveEvents.fire({});
 }
diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h
index 8feb329a90df5..79dc3c6fe786d 100644
--- a/Telegram/SourceFiles/window/main_window.h
+++ b/Telegram/SourceFiles/window/main_window.h
@@ -119,7 +119,8 @@ class MainWindow : public Ui::RpWindow {
 
 	void launchDrag(std::unique_ptr<QMimeData> data, Fn<void()> &&callback);
 
-	rpl::producer<> leaveEvents() const;
+	[[nodiscard]] rpl::producer<> leaveEvents() const;
+	[[nodiscard]] rpl::producer<> imeCompositionStarts() const;
 
 	virtual void updateWindowIcon() = 0;
 	void updateTitle();
@@ -185,6 +186,7 @@ class MainWindow : public Ui::RpWindow {
 		return false;
 	}
 
+	void imeCompositionStartReceived();
 	void setPositionInited();
 
 	virtual QRect computeDesktopRect() const;
@@ -214,6 +216,7 @@ class MainWindow : public Ui::RpWindow {
 	bool _isActive = false;
 
 	rpl::event_stream<> _leaveEvents;
+	rpl::event_stream<> _imeCompositionStartReceived;
 
 	bool _maximizedBeforeHide = false;
 

From 15697f4f2b81b9fbab920067919671a8361a8de7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 8 May 2024 10:29:17 +0400
Subject: [PATCH 063/400] Fix libpng package name in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7b77617691284..79148548e7fb9 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -331,7 +331,7 @@ parts:
       - liblcms2-2
       - libopengl0
       - libpcre2-16-0
-      - libpng16-16
+      - libpng16-16t64
       - libsm6
       - libssl3
       - libvulkan1

From 6ebbca58e87d80140c5ee42b60496d42b6e53f93 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 13 May 2024 19:46:18 +0400
Subject: [PATCH 064/400] Track major version for official GitHub helpers in
 actions

---
 .github/workflows/docker.yml         | 2 +-
 .github/workflows/linux.yml          | 4 ++--
 .github/workflows/mac.yml            | 8 ++++----
 .github/workflows/mac_packaged.yml   | 6 +++---
 .github/workflows/master_updater.yml | 2 +-
 .github/workflows/snap.yml           | 4 ++--
 .github/workflows/win.yml            | 6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e702263451632..bf2008732f21c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0d772b8d7f1e4..e8d8f59010d98 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -58,7 +58,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
@@ -116,7 +116,7 @@ jobs:
           cd $REPO_NAME/out/Debug
           sudo mkdir artifact
           sudo mv {Telegram,Updater} artifact/
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 0bd06cb1fd9f1..8a83d62dd37ea 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -56,7 +56,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
@@ -76,7 +76,7 @@ jobs:
 
       - name: ThirdParty cache.
         id: cache-third-party
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: ThirdParty
           key: ${{ runner.OS }}-third-party-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
@@ -84,7 +84,7 @@ jobs:
 
       - name: Libraries cache.
         id: cache-libs
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: Libraries
           key: ${{ runner.OS }}-libs-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
@@ -134,7 +134,7 @@ jobs:
           mkdir artifact
           mv Telegram.app artifact/
           mv Updater artifact/
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index 7f0daf22d0312..9b40c249e7f2f 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -60,7 +60,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
@@ -99,7 +99,7 @@ jobs:
 
       - name: WebRTC cache.
         id: cache-webrtc
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: ${{ env.LibrariesPath }}/tg_owt
           key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_owt-version.json') }}
@@ -153,7 +153,7 @@ jobs:
           cd $REPO_NAME/build
           mkdir artifact
           mv Telegram.dmg artifact/
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/master_updater.yml b/.github/workflows/master_updater.yml
index a4e50c1240edc..c59f62e29ad93 100644
--- a/.github/workflows/master_updater.yml
+++ b/.github/workflows/master_updater.yml
@@ -11,7 +11,7 @@ jobs:
       SKIP: "0"
       to_branch: "master"
     steps:
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
         if: env.SKIP == '0'
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index ae4371f0d19a1..3d01478e6f50c 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
@@ -75,7 +75,7 @@ jobs:
           mkdir artifact
           mv $artifact_name artifact
 
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 222366c6cf3c4..1200e1de05dd9 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -75,7 +75,7 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: Clone.
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}
@@ -96,7 +96,7 @@ jobs:
 
       - name: Libraries cache.
         id: cache-libs
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: ${{ env.TBUILD }}\Libraries
           key: ${{ runner.OS }}-${{ matrix.arch }}-libs-${{ env.CACHE_KEY }}
@@ -183,7 +183,7 @@ jobs:
           mkdir artifact
           move %OUT%\Telegram.exe artifact/
           move %OUT%\Updater.exe artifact/
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v2
         name: Upload artifact.
         if: (env.UPLOAD_ARTIFACT == 'true') || (github.ref == 'refs/heads/nightly')
         with:

From d28b9f10b469ebee69b76dfbb1b24a59e089ef41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 13:06:59 +0000
Subject: [PATCH 065/400] Bump jlumbroso/free-disk-space from 1.3.0 to 1.3.1

Bumps [jlumbroso/free-disk-space](https://github.com/jlumbroso/free-disk-space) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/jlumbroso/free-disk-space/releases)
- [Commits](https://github.com/jlumbroso/free-disk-space/compare/f68fdb76e2ea636224182cfb7377ff9a1708f9b8...54081f138730dfa15788a46383842cd2f914a1be)

---
updated-dependencies:
- dependency-name: jlumbroso/free-disk-space
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docker.yml | 2 +-
 .github/workflows/snap.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bf2008732f21c..ac40f3a330ec2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -31,7 +31,7 @@ jobs:
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
 
       - name: Free up some disk space.
-        uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
 
       - name: Docker image build.
         run: |
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 3d01478e6f50c..c2ee6773a4240 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -61,7 +61,7 @@ jobs:
           sudo snap run lxd waitready
 
       - name: Free up some disk space.
-        uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
 
       - name: Telegram Desktop snap build.
         run: sg lxd -c 'snap run snapcraft --verbosity=debug'

From 3358673ba423b539611be2fbf9ff23de680afeaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Fri, 10 May 2024 18:05:08 +0200
Subject: [PATCH 066/400] Add compatibility with FFMPEG 7.0

avio: Constify data pointees of write callbacks

avutil: remove deprecated FF_API_PKT_DURATION

Ref: https://github.com/FFmpeg/FFmpeg/commit/2a68d945cd74265bb71c3d38b7a2e7f7d7e87be5
     https://github.com/FFmpeg/FFmpeg/commit/02aea61d69d8f81bc285e2131bf25f96a3e27feb
     https://github.com/FFmpeg/FFmpeg/commit/b8fef7e9c520b3923b32813b6a82c154c74402dc
---
 .../ffmpeg/ffmpeg_frame_generator.cpp          |  4 ++++
 Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp |  8 ++++++++
 Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h   | 18 ++++++++++++++++--
 .../media/audio/media_audio_capture.cpp        |  4 ++++
 .../media/clip/media_clip_ffmpeg.cpp           |  4 ++++
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp
index 116d998a2a3b5..de478b784b67b 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp
@@ -291,7 +291,11 @@ void FrameGenerator::Impl::jumpToStart() {
 
 void FrameGenerator::Impl::resolveNextFrameTiming() {
 	const auto base = _format->streams[_streamId]->time_base;
+#if DA_FFMPEG_HAVE_DURATION
+	const auto duration = _next.frame->duration;
+#else
 	const auto duration = _next.frame->pkt_duration;
+#endif
 	const auto framePts = _next.frame->pts;
 	auto framePosition = (framePts * 1000LL * base.num) / base.den;
 	_currentFrameDelay = _nextFrameDelay;
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
index 2a42d0034c7a5..0f7083df369a4 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
@@ -230,7 +230,11 @@ enum AVPixelFormat GetFormatImplementation(
 IOPointer MakeIOPointer(
 		void *opaque,
 		int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+		int(*write)(void *opaque, const uint8_t *buffer, int bufferSize),
+#else
 		int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
+#endif
 		int64_t(*seek)(void *opaque, int64_t offset, int whence)) {
 	auto buffer = reinterpret_cast<uchar*>(av_malloc(kAvioBlockSize));
 	if (!buffer) {
@@ -263,7 +267,11 @@ void IODeleter::operator()(AVIOContext *value) {
 FormatPointer MakeFormatPointer(
 		void *opaque,
 		int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+		int(*write)(void *opaque, const uint8_t *buffer, int bufferSize),
+#else
 		int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
+#endif
 		int64_t(*seek)(void *opaque, int64_t offset, int whence)) {
 	auto io = MakeIOPointer(opaque, read, write, seek);
 	if (!io) {
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
index bc9c8764b9696..d96daa9c79279 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
@@ -22,8 +22,14 @@ extern "C" {
 #include <libavutil/version.h>
 } // extern "C"
 
-#define DA_FFMPEG_NEW_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR > 57 \
-	|| (LIBAVUTIL_VERSION_MAJOR == 57 && LIBAVUTIL_VERSION_MINOR >= 28))
+#define DA_FFMPEG_NEW_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_INT >= \
+	AV_VERSION_INT(57, 28, 100))
+
+#define DA_FFMPEG_CONST_WRITE_CALLBACK (LIBAVFORMAT_VERSION_INT >= \
+	AV_VERSION_INT(61, 01, 100))
+
+#define DA_FFMPEG_HAVE_DURATION (LIBAVUTIL_VERSION_INT >= \
+	AV_VERSION_INT(58, 02, 100))
 
 class QImage;
 
@@ -112,7 +118,11 @@ using IOPointer = std::unique_ptr<AVIOContext, IODeleter>;
 [[nodiscard]] IOPointer MakeIOPointer(
 	void *opaque,
 	int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+	int(*write)(void *opaque, const uint8_t *buffer, int bufferSize),
+#else
 	int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
+#endif
 	int64_t(*seek)(void *opaque, int64_t offset, int whence));
 
 struct FormatDeleter {
@@ -122,7 +132,11 @@ using FormatPointer = std::unique_ptr<AVFormatContext, FormatDeleter>;
 [[nodiscard]] FormatPointer MakeFormatPointer(
 	void *opaque,
 	int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+	int(*write)(void *opaque, const uint8_t *buffer, int bufferSize),
+#else
 	int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
+#endif
 	int64_t(*seek)(void *opaque, int64_t offset, int whence));
 
 struct CodecDeleter {
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index b9151db2a0804..1bbf9b10c28b3 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -249,7 +249,11 @@ struct Instance::Inner::Private {
 		return nbytes;
 	}
 
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+	static int WriteData(void *opaque, const uint8_t *buf, int buf_size) {
+#else
 	static int WriteData(void *opaque, uint8_t *buf, int buf_size) {
+#endif
 		auto l = reinterpret_cast<Private*>(opaque);
 
 		if (buf_size <= 0) return 0;
diff --git a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
index 9f1c7b2349588..1188f02324209 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
@@ -144,7 +144,11 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
 }
 
 void FFMpegReaderImplementation::processReadFrame() {
+#if DA_FFMPEG_HAVE_DURATION
+	int64 duration = _frame->duration;
+#else
 	int64 duration = _frame->pkt_duration;
+#endif
 	int64 framePts = _frame->pts;
 	crl::time frameMs = (framePts * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
 	_currentFrameDelay = _nextFrameDelay;

From 923e3ee8080b3d91a0aa643408127c95aa2375e9 Mon Sep 17 00:00:00 2001
From: GoodDok <konstantingudkov@gmail.com>
Date: Sat, 4 May 2024 02:56:13 +0300
Subject: [PATCH 067/400] Fix 25202: surrounding $PWD with double quotes

Added double quotes to work correctly with spaces in current directory's name
---
 docs/building-linux.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/building-linux.md b/docs/building-linux.md
index 393bd854ac589..e8a0b050b87b1 100644
--- a/docs/building-linux.md
+++ b/docs/building-linux.md
@@ -20,7 +20,7 @@ Install [poetry](https://python-poetry.org), go to ***BuildPath*** and run
 Go to ***BuildPath*/tdesktop** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
 
     docker run --rm -it \
-        -v $PWD:/usr/src/tdesktop \
+        -v "$PWD:/usr/src/tdesktop" \
         tdesktop:centos_env \
         /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \
         -D TDESKTOP_API_ID=YOUR_API_ID \
@@ -29,7 +29,7 @@ Go to ***BuildPath*/tdesktop** and run (using [your **api_id** and **api_hash**]
 Or, to create a debug build, run (also using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
 
     docker run --rm -it \
-        -v $PWD:/usr/src/tdesktop \
+        -v "$PWD:/usr/src/tdesktop" \
         -e CONFIG=Debug \
         tdesktop:centos_env \
         /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \

From 334fd4e951029ae15caeae917d5a4c382793a472 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 7 May 2024 17:47:52 +0300
Subject: [PATCH 068/400] Added ability to edit media with spoiled one without
 resending.

---
 Telegram/CMakeLists.txt                       |  2 +
 Telegram/SourceFiles/api/api_editing.cpp      | 39 ++++++++-
 Telegram/SourceFiles/api/api_editing.h        |  3 +-
 .../SourceFiles/history/history_widget.cpp    | 23 ++++-
 Telegram/SourceFiles/history/history_widget.h |  3 +
 .../view/controls/compose_controls_common.h   |  1 +
 .../history_view_compose_controls.cpp         | 67 ++++++++++++++-
 .../controls/history_view_compose_controls.h  | 11 +++
 ...istory_view_compose_media_edit_manager.cpp | 83 +++++++++++++++++++
 .../history_view_compose_media_edit_manager.h | 39 +++++++++
 .../view/history_view_replies_section.cpp     |  9 +-
 .../view/history_view_replies_section.h       |  3 +-
 .../view/history_view_scheduled_section.cpp   |  9 +-
 .../view/history_view_scheduled_section.h     |  3 +-
 .../business/settings_shortcut_messages.cpp   | 12 ++-
 15 files changed, 285 insertions(+), 22 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
 create mode 100644 Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2f42270ee2704..88d42a190dc92 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -688,6 +688,8 @@ PRIVATE
     history/view/controls/compose_controls_common.h
     history/view/controls/history_view_compose_controls.cpp
     history/view/controls/history_view_compose_controls.h
+    history/view/controls/history_view_compose_media_edit_manager.cpp
+    history/view/controls/history_view_compose_media_edit_manager.h
     history/view/controls/history_view_compose_search.cpp
     history/view/controls/history_view_compose_search.h
     history/view/controls/history_view_draft_options.cpp
diff --git a/Telegram/SourceFiles/api/api_editing.cpp b/Telegram/SourceFiles/api/api_editing.cpp
index f91a73579b936..5705d267ea35d 100644
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -252,12 +252,47 @@ mtpRequestId EditTextMessage(
 		Data::WebPageDraft webpage,
 		SendOptions options,
 		Fn<void(mtpRequestId requestId)> done,
-		Fn<void(const QString &, mtpRequestId requestId)> fail) {
+		Fn<void(const QString &error, mtpRequestId requestId)> fail,
+		std::optional<bool> spoilerMediaOverride) {
 	const auto callback = [=](Fn<void()> applyUpdates, mtpRequestId id) {
 		applyUpdates();
 		done(id);
 	};
-	return EditMessage(item, caption, webpage, options, callback, fail);
+	auto inputMedia = std::optional<MTPInputMedia>();
+	if (spoilerMediaOverride) {
+		const auto spoiler = *spoilerMediaOverride;
+		if (const auto media = item->media()) {
+			if (const auto photo = media->photo()) {
+				using Flag = MTPDinputMediaPhoto::Flag;
+				const auto flags = Flag()
+					| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
+					| (spoiler ? Flag::f_spoiler : Flag());
+				inputMedia = MTP_inputMediaPhoto(
+					MTP_flags(flags),
+					photo->mtpInput(),
+					MTP_int(media->ttlSeconds()));
+			} else if (const auto document = media->document()) {
+				using Flag = MTPDinputMediaDocument::Flag;
+				const auto flags = Flag()
+					| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
+					| (spoiler ? Flag::f_spoiler : Flag());
+				inputMedia = MTP_inputMediaDocument(
+					MTP_flags(flags),
+					document->mtpInput(),
+					MTP_int(media->ttlSeconds()),
+					MTPstring()); // query
+			}
+		}
+	}
+
+	return EditMessage(
+		item,
+		caption,
+		webpage,
+		options,
+		callback,
+		fail,
+		inputMedia);
 }
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_editing.h b/Telegram/SourceFiles/api/api_editing.h
index 86f106f45e9de..c8d0f6c5092ac 100644
--- a/Telegram/SourceFiles/api/api_editing.h
+++ b/Telegram/SourceFiles/api/api_editing.h
@@ -55,6 +55,7 @@ mtpRequestId EditTextMessage(
 	Data::WebPageDraft webpage,
 	SendOptions options,
 	Fn<void(mtpRequestId requestId)> done,
-	Fn<void(const QString &error, mtpRequestId requestId)> fail);
+	Fn<void(const QString &error, mtpRequestId requestId)> fail,
+	std::optional<bool> spoilerMediaOverride);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index fdd4935a08345..5e8da7f99d11b 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2656,6 +2656,7 @@ void HistoryWidget::setEditMsgId(MsgId msgId) {
 	unregisterDraftSources();
 	_editMsgId = msgId;
 	if (!msgId) {
+		_mediaEditSpoiler.setSpoilerOverride(std::nullopt);
 		_canReplaceMedia = false;
 		if (_preview) {
 			_preview->setDisabled(false);
@@ -4043,7 +4044,8 @@ void HistoryWidget::saveEditMsg() {
 		webPageDraft,
 		options,
 		done,
-		fail);
+		fail,
+		_mediaEditSpoiler.spoilerOverride());
 }
 
 void HistoryWidget::hideChildWidgets() {
@@ -6562,7 +6564,14 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 		return;
 	}
 	const auto isReadyToForward = readyToForward();
-	if (_inPhotoEdit && _photoEditMedia) {
+	if (_editMsgId
+		&& (_inDetails || _inPhotoEdit)
+		&& (e->button() == Qt::RightButton)) {
+		_mediaEditSpoiler.showMenu(
+			_list,
+			session().data().message(_history->peer, _editMsgId),
+			[=](bool) { mouseMoveEvent(nullptr); });
+	} else if (_inPhotoEdit && _photoEditMedia) {
 		EditCaptionBox::StartPhotoEdit(
 			controller(),
 			_photoEditMedia,
@@ -8235,8 +8244,14 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 		? drawMsgText->media()
 		: nullptr;
 	const auto hasPreview = media && media->hasReplyPreview();
-	const auto preview = hasPreview ? media->replyPreview() : nullptr;
-	const auto spoilered = preview && media->hasSpoiler();
+	const auto preview = _mediaEditSpoiler.spoilerOverride()
+		? _mediaEditSpoiler.mediaPreview(drawMsgText)
+		: hasPreview
+		? media->replyPreview()
+		: nullptr;
+	const auto spoilered = _mediaEditSpoiler.spoilerOverride()
+		? (*_mediaEditSpoiler.spoilerOverride())
+		: (preview && media->hasSpoiler());
 	if (!spoilered) {
 		_replySpoiler = nullptr;
 	} else if (!_replySpoiler) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index b4d8bb49cc7ac..b731507b2ba80 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "history/view/controls/history_view_compose_media_edit_manager.h"
 #include "history/view/history_view_corner_buttons.h"
 #include "history/history_drag_area.h"
 #include "history/history_view_highlight_manager.h"
@@ -103,6 +104,7 @@ class ForwardPanel;
 class TTLButton;
 class WebpageProcessor;
 class CharactersLimitLabel;
+class PhotoEditSpoilerManager;
 } // namespace HistoryView::Controls
 
 class BotKeyboard;
@@ -660,6 +662,7 @@ class HistoryWidget final
 	MsgId _editMsgId = 0;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
 	bool _canReplaceMedia = false;
+	HistoryView::MediaEditSpoilerManager _mediaEditSpoiler;
 
 	HistoryItem *_replyEditMsg = nullptr;
 	Ui::Text::String _replyEditMsgText;
diff --git a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
index e707523ecc5f4..01237072b6fcc 100644
--- a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
+++ b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
@@ -21,6 +21,7 @@ struct MessageToEdit {
 	FullMsgId fullId;
 	Api::SendOptions options;
 	TextWithTags textWithTags;
+	std::optional<bool> spoilerMediaOverride;
 };
 struct VoiceToSend {
 	QByteArray bytes;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index dff29122c17be..9154d846ea389 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -50,6 +50,7 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/view/controls/history_view_characters_limit.h"
+#include "history/view/controls/history_view_compose_media_edit_manager.h"
 #include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/controls/history_view_draft_options.h"
 #include "history/view/controls/history_view_voice_record_bar.h"
@@ -72,6 +73,7 @@ For license and copyright information please follow this link:
 #include "ui/ui_utility.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/text/format_values.h"
 #include "ui/controls/emoji_button.h"
 #include "ui/controls/send_button.h"
@@ -84,6 +86,7 @@ For license and copyright information please follow this link:
 #include "mainwindow.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
 
 namespace HistoryView {
 namespace {
@@ -210,6 +213,8 @@ class FieldHeader final : public Ui::RpWidget {
 	bool _repaintScheduled : 1 = false;
 	bool _inClickable : 1 = false;
 
+	HistoryView::MediaEditSpoilerManager _mediaEditSpoiler;
+
 	const not_null<Data::Session*> _data;
 	const not_null<Ui::IconButton*> _cancel;
 
@@ -398,7 +403,12 @@ void FieldHeader::init() {
 					_editOptionsRequests.fire({});
 				}
 			} else if (!isLeftButton) {
-				if (const auto reply = replyingToMessage()) {
+				if (inPreviewRect && isEditingMessage()) {
+					_mediaEditSpoiler.showMenu(
+						this,
+						_data->message(_editMsgId.current()),
+						[=](bool) { update(); });
+				} else if (const auto reply = replyingToMessage()) {
 					_jumpToItemRequests.fire_copy(reply);
 				}
 			}
@@ -572,10 +582,14 @@ void FieldHeader::paintEditOrReplyToMessage(Painter &p) {
 
 	const auto media = _shownMessage->media();
 	_shownMessageHasPreview = media && media->hasReplyPreview();
-	const auto preview = _shownMessageHasPreview
+	const auto preview = _mediaEditSpoiler.spoilerOverride()
+		? _mediaEditSpoiler.mediaPreview(_shownMessage)
+		: _shownMessageHasPreview
 		? media->replyPreview()
 		: nullptr;
-	const auto spoilered = preview && media->hasSpoiler();
+	const auto spoilered = _mediaEditSpoiler.spoilerOverride()
+		? (*_mediaEditSpoiler.spoilerOverride())
+		: (preview && media->hasSpoiler());
 	if (!spoilered) {
 		_shownPreviewSpoiler = nullptr;
 	} else if (!_shownPreviewSpoiler) {
@@ -720,6 +734,7 @@ void FieldHeader::editMessage(FullMsgId id, bool photoEditAllowed) {
 	_photoEditAllowed = photoEditAllowed;
 	_editMsgId = id;
 	if (!photoEditAllowed) {
+		_mediaEditSpoiler.setSpoilerOverride(std::nullopt);
 		_inPhotoEdit = false;
 		_inPhotoEditOver.stop();
 	}
@@ -767,6 +782,7 @@ MessageToEdit FieldHeader::queryToEdit() {
 			.scheduled = item->isScheduled() ? item->date() : 0,
 			.shortcutId = item->shortcutId(),
 		},
+		.spoilerMediaOverride = _mediaEditSpoiler.spoilerOverride(),
 	};
 }
 
@@ -3440,4 +3456,49 @@ rpl::producer<bool> SendDisabledBySlowmode(not_null<PeerData*> peer) {
 			_1 && _2);
 }
 
+void ShowPhotoEditSpoilerMenu(
+		not_null<Ui::RpWidget*> parent,
+		not_null<HistoryItem*> item,
+		const std::optional<bool> &override,
+		Fn<void(bool)> callback) {
+	const auto media = item->media();
+	const auto hasPreview = media && media->hasReplyPreview();
+	const auto preview = hasPreview ? media->replyPreview() : nullptr;
+	if (!preview) {
+		return;
+	}
+	const auto spoilered = override
+		? (*override)
+		: (preview && media->hasSpoiler());
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	menu->addAction(
+		spoilered
+			? tr::lng_context_disable_spoiler(tr::now)
+			: tr::lng_context_spoiler_effect(tr::now),
+		[=] { callback(!spoilered); },
+		spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler);
+	menu->popup(QCursor::pos());
+}
+
+Image *MediaPreviewWithOverriddenSpoiler(
+		not_null<HistoryItem*> item,
+		bool spoiler) {
+	if (const auto media = item->media()) {
+		if (const auto photo = media->photo()) {
+			return photo->getReplyPreview(
+				item->fullId(),
+				item->history()->peer,
+				spoiler);
+		} else if (const auto document = media->document()) {
+			return document->getReplyPreview(
+				item->fullId(),
+				item->history()->peer,
+				spoiler);
+		}
+	}
+	return nullptr;
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index b24e0213abcb8..f6c915968c08f 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -22,6 +22,7 @@ For license and copyright information please follow this link:
 class History;
 class DocumentData;
 class FieldAutocomplete;
+class Image;
 
 namespace style {
 struct ComposeControls;
@@ -451,4 +452,14 @@ class ComposeControls final {
 [[nodiscard]] rpl::producer<bool> SendDisabledBySlowmode(
 	not_null<PeerData*> peer);
 
+void ShowPhotoEditSpoilerMenu(
+	not_null<Ui::RpWidget*> parent,
+	not_null<HistoryItem*> item,
+	const std::optional<bool> &override,
+	Fn<void(bool)> callback);
+
+[[nodiscard]] Image *MediaPreviewWithOverriddenSpoiler(
+	not_null<HistoryItem*> item,
+	bool spoiler);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
new file mode 100644
index 0000000000000..940ff7ff24be3
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
@@ -0,0 +1,83 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/controls/history_view_compose_media_edit_manager.h"
+
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "ui/widgets/popup_menu.h"
+#include "styles/style_menu_icons.h"
+
+namespace HistoryView {
+
+MediaEditSpoilerManager::MediaEditSpoilerManager() = default;
+
+void MediaEditSpoilerManager::showMenu(
+		not_null<Ui::RpWidget*> parent,
+		not_null<HistoryItem*> item,
+		Fn<void(bool)> callback) {
+	const auto media = item->media();
+	const auto hasPreview = media && media->hasReplyPreview();
+	const auto preview = hasPreview ? media->replyPreview() : nullptr;
+	if (!preview) {
+		return;
+	}
+	const auto spoilered = _spoilerOverride
+		? (*_spoilerOverride)
+		: (preview && media->hasSpoiler());
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	menu->addAction(
+		spoilered
+			? tr::lng_context_disable_spoiler(tr::now)
+			: tr::lng_context_spoiler_effect(tr::now),
+		[=] {
+			_spoilerOverride = (!spoilered);
+			if (callback) {
+				callback(!spoilered);
+			}
+		},
+		spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler);
+	menu->popup(QCursor::pos());
+}
+
+[[nodiscard]] Image *MediaEditSpoilerManager::mediaPreview(
+		not_null<HistoryItem*> item) {
+	if (!_spoilerOverride) {
+		return nullptr;
+	}
+	if (const auto media = item->media()) {
+		if (const auto photo = media->photo()) {
+			return photo->getReplyPreview(
+				item->fullId(),
+				item->history()->peer,
+				*_spoilerOverride);
+		} else if (const auto document = media->document()) {
+			return document->getReplyPreview(
+				item->fullId(),
+				item->history()->peer,
+				*_spoilerOverride);
+		}
+	}
+	return nullptr;
+}
+
+void MediaEditSpoilerManager::setSpoilerOverride(
+		std::optional<bool> spoilerOverride) {
+	_spoilerOverride = spoilerOverride;
+}
+
+std::optional<bool> MediaEditSpoilerManager::spoilerOverride() const {
+	return _spoilerOverride;
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h
new file mode 100644
index 0000000000000..8bc34b7c4e0ee
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h
@@ -0,0 +1,39 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+class Image;
+class HistoryItem;
+
+namespace HistoryView {
+
+class MediaEditSpoilerManager final {
+public:
+	MediaEditSpoilerManager();
+
+	void showMenu(
+		not_null<Ui::RpWidget*> parent,
+		not_null<HistoryItem*> item,
+		Fn<void(bool)> callback);
+
+	[[nodiscard]] Image *mediaPreview(not_null<HistoryItem*> item);
+
+	void setSpoilerOverride(std::optional<bool> spoilerOverride);
+
+	std::optional<bool> spoilerOverride() const;
+
+private:
+	std::optional<bool> _spoilerOverride;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index afd77d6657ce2..1974cce2b8033 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -736,7 +736,8 @@ void RepliesWidget::setupComposeControls() {
 	_composeControls->editRequests(
 	) | rpl::start_with_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
-			edit(item, data.options, saveEditMsgRequestId);
+			const auto spoiler = data.spoilerMediaOverride;
+			edit(item, data.options, saveEditMsgRequestId, spoiler);
 		}
 	}, lifetime());
 
@@ -1207,7 +1208,8 @@ void RepliesWidget::send(Api::SendOptions options) {
 void RepliesWidget::edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId) {
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride) {
 	if (*saveEditMsgRequestId) {
 		return;
 	}
@@ -1275,7 +1277,8 @@ void RepliesWidget::edit(
 		webpage,
 		options,
 		crl::guard(this, done),
-		crl::guard(this, fail));
+		crl::guard(this, fail),
+		spoilerMediaOverride);
 
 	_composeControls->hidePanelsAnimated();
 	doSetInnerFocus();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 3da1c44f0ae87..33b7859b48930 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -246,7 +246,8 @@ class RepliesWidget final
 	void edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId);
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
 	[[nodiscard]] SendMenu::Type sendMenuType() const;
 	[[nodiscard]] FullReplyTo replyTo() const;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 6673474234e19..887d16e095431 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -318,7 +318,8 @@ void ScheduledWidget::setupComposeControls() {
 	) | rpl::start_with_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
 			if (item->isScheduled()) {
-				edit(item, data.options, saveEditMsgRequestId);
+				const auto spoiler = data.spoilerMediaOverride;
+				edit(item, data.options, saveEditMsgRequestId, spoiler);
 			}
 		}
 	}, lifetime());
@@ -726,7 +727,8 @@ void ScheduledWidget::sendVoice(
 void ScheduledWidget::edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId) {
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride) {
 	if (*saveEditMsgRequestId) {
 		return;
 	}
@@ -794,7 +796,8 @@ void ScheduledWidget::edit(
 		webpage,
 		options,
 		crl::guard(this, done),
-		crl::guard(this, fail));
+		crl::guard(this, fail),
+		spoilerMediaOverride);
 
 	_composeControls->hidePanelsAnimated();
 	_composeControls->focus();
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 43702688feae6..6685c113a4cb0 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -213,7 +213,8 @@ class ScheduledWidget final
 	void edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId);
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride);
 	void highlightSingleNewMessage(const Data::MessagesSlice &slice);
 	void chooseAttach();
 	[[nodiscard]] SendMenu::Type sendMenuType() const;
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index efeffaac98598..ca82da32981e4 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -238,7 +238,8 @@ class ShortcutMessages
 	void edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId);
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
 	[[nodiscard]] SendMenu::Type sendMenuType() const;
 	[[nodiscard]] FullReplyTo replyTo() const;
@@ -673,7 +674,8 @@ void ShortcutMessages::setupComposeControls() {
 	) | rpl::start_with_next([=](auto data) {
 		if (const auto item = _session->data().message(data.fullId)) {
 			if (item->isBusinessShortcut()) {
-				edit(item, data.options, saveEditMsgRequestId);
+				const auto spoiler = data.spoilerMediaOverride;
+				edit(item, data.options, saveEditMsgRequestId, spoiler);
 			}
 		}
 	}, lifetime());
@@ -1213,7 +1215,8 @@ void ShortcutMessages::send(Api::SendOptions options) {
 void ShortcutMessages::edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
-		mtpRequestId *const saveEditMsgRequestId) {
+		mtpRequestId *const saveEditMsgRequestId,
+		std::optional<bool> spoilerMediaOverride) {
 	if (*saveEditMsgRequestId) {
 		return;
 	}
@@ -1281,7 +1284,8 @@ void ShortcutMessages::edit(
 		webpage,
 		options,
 		crl::guard(this, done),
-		crl::guard(this, fail));
+		crl::guard(this, fail),
+		spoilerMediaOverride);
 
 	_composeControls->hidePanelsAnimated();
 	doSetInnerFocus();

From 7a95b38d3c9239b4ad4cb1ff4a5adc880ef318be Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 13 May 2024 22:05:09 +0300
Subject: [PATCH 069/400] Fixed refreshing of file reference in api media
 spoiler editing module.

---
 Telegram/SourceFiles/api/api_editing.cpp | 84 +++++++++++++++++++-----
 1 file changed, 69 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_editing.cpp b/Telegram/SourceFiles/api/api_editing.cpp
index 5705d267ea35d..7dcd768cb4ff5 100644
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "ui/boxes/confirm_box.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/components/scheduled_messages.h"
+#include "data/data_file_origin.h"
 #include "data/data_histories.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
@@ -254,37 +255,90 @@ mtpRequestId EditTextMessage(
 		Fn<void(mtpRequestId requestId)> done,
 		Fn<void(const QString &error, mtpRequestId requestId)> fail,
 		std::optional<bool> spoilerMediaOverride) {
-	const auto callback = [=](Fn<void()> applyUpdates, mtpRequestId id) {
-		applyUpdates();
-		done(id);
-	};
-	auto inputMedia = std::optional<MTPInputMedia>();
 	if (spoilerMediaOverride) {
 		const auto spoiler = *spoilerMediaOverride;
 		if (const auto media = item->media()) {
+			auto takeInputMedia = Fn<std::optional<MTPInputMedia>()>(nullptr);
+			auto takeFileReference = Fn<QByteArray()>(nullptr);
 			if (const auto photo = media->photo()) {
 				using Flag = MTPDinputMediaPhoto::Flag;
 				const auto flags = Flag()
 					| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
 					| (spoiler ? Flag::f_spoiler : Flag());
-				inputMedia = MTP_inputMediaPhoto(
-					MTP_flags(flags),
-					photo->mtpInput(),
-					MTP_int(media->ttlSeconds()));
+				takeInputMedia = [=] {
+					return MTP_inputMediaPhoto(
+						MTP_flags(flags),
+						photo->mtpInput(),
+						MTP_int(media->ttlSeconds()));
+				};
+				takeFileReference = [=] { return photo->fileReference(); };
 			} else if (const auto document = media->document()) {
 				using Flag = MTPDinputMediaDocument::Flag;
 				const auto flags = Flag()
 					| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
 					| (spoiler ? Flag::f_spoiler : Flag());
-				inputMedia = MTP_inputMediaDocument(
-					MTP_flags(flags),
-					document->mtpInput(),
-					MTP_int(media->ttlSeconds()),
-					MTPstring()); // query
+				takeInputMedia = [=] {
+					return MTP_inputMediaDocument(
+						MTP_flags(flags),
+						document->mtpInput(),
+						MTP_int(media->ttlSeconds()),
+						MTPstring()); // query
+				};
+				takeFileReference = [=] { return document->fileReference(); };
 			}
+
+			const auto usedFileReference = takeFileReference
+				? takeFileReference()
+				: QByteArray();
+			const auto origin = item->fullId();
+			const auto api = &item->history()->session().api();
+			const auto performRequest = [=](
+					const auto &repeatRequest,
+					mtpRequestId originalRequestId) -> mtpRequestId {
+				const auto handleReference = [=](
+						const QString &error,
+						mtpRequestId requestId) {
+					if (error.startsWith(u"FILE_REFERENCE_"_q)) {
+						api->refreshFileReference(origin, [=](const auto &) {
+							if (takeFileReference &&
+								(takeFileReference() != usedFileReference)) {
+								repeatRequest(
+									repeatRequest,
+									originalRequestId
+										? originalRequestId
+										: requestId);
+							} else {
+								fail(error, requestId);
+							}
+						});
+					} else {
+						fail(error, requestId);
+					}
+				};
+				const auto callback = [=](
+						Fn<void()> applyUpdates,
+						mtpRequestId requestId) {
+					applyUpdates();
+					done(originalRequestId ? originalRequestId : requestId);
+				};
+				const auto requestId = EditMessage(
+					item,
+					caption,
+					webpage,
+					options,
+					callback,
+					handleReference,
+					takeInputMedia ? takeInputMedia() : std::nullopt);
+				return originalRequestId ? originalRequestId : requestId;
+			};
+			return performRequest(performRequest, 0);
 		}
 	}
 
+	const auto callback = [=](Fn<void()> applyUpdates, mtpRequestId id) {
+		applyUpdates();
+		done(id);
+	};
 	return EditMessage(
 		item,
 		caption,
@@ -292,7 +346,7 @@ mtpRequestId EditTextMessage(
 		options,
 		callback,
 		fail,
-		inputMedia);
+		std::nullopt);
 }
 
 } // namespace Api

From bc11c667770471b83d4f1d27027b1995816e3f3f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 00:44:52 +0300
Subject: [PATCH 070/400] Added ability to hide single sponsored message to
 premium users.

---
 .../data/components/sponsored_messages.cpp    | 25 +++++++++++++------
 Telegram/SourceFiles/menu/menu_sponsored.cpp  | 12 ++++++---
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index 4cb54fc7ea0aa..c20ec967eb489 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -443,6 +443,22 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 			return;
 		}
 
+		const auto erase = [=] {
+			const auto it = _data.find(history);
+			if (it != end(_data)) {
+				auto &list = it->second.entries;
+				const auto proj = [&](const Entry &e) {
+					return e.itemFullId == fullId;
+				};
+				list.erase(ranges::remove_if(list, proj), end(list));
+			}
+		};
+
+		if (optionId == Result::Id("-1")) {
+			erase();
+			return;
+		}
+
 		state->requestId = _session->api().request(
 			MTPchannels_ReportSponsoredMessage(
 				channel->inputChannel,
@@ -469,14 +485,7 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 			}, [](const TLAdsHidden &data) -> Result {
 				return { .result = Result::FinalStep::Hidden };
 			}, [&](const TLReported &data) -> Result {
-				const auto it = _data.find(history);
-				if (it != end(_data)) {
-					auto &list = it->second.entries;
-					const auto proj = [&](const Entry &e) {
-						return e.itemFullId == fullId;
-					};
-					list.erase(ranges::remove_if(list, proj), end(list));
-				}
+				erase();
 				if (optionId == Result::Id("1")) { // I don't like it.
 					return { .result = Result::FinalStep::Silence };
 				}
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index e917c3f077a49..f836106d02ee1 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -332,9 +332,7 @@ void ShowSponsored(
 		not_null<HistoryItem*> item) {
 	Expects(item->isSponsored());
 
-	struct State final {
-	};
-	const auto state = std::make_shared<State>();
+	const auto session = &item->history()->session();
 
 	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
 		parent.get(),
@@ -351,7 +349,13 @@ void ShowSponsored(
 	menu->addSeparator(&st::expandedMenuSeparator);
 
 	menu->addAction(tr::lng_sponsored_hide_ads(tr::now), [=] {
-		ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
+		if (session->premium()) {
+			using Result = Data::SponsoredReportResult;
+			session->sponsoredMessages().createReportCallback(
+				item->fullId())(Result::Id("-1"), [](const auto &) {});
+		} else {
+			ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
+		}
 	}, &st::menuIconCancel);
 
 	menu->popup(QCursor::pos());

From 3e7d4af4a03cf2987b94376159d1c43e08854276 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 01:01:01 +0300
Subject: [PATCH 071/400] Fixed reply bubble width for short quotes.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_reply.cpp b/Telegram/SourceFiles/history/view/history_view_reply.cpp
index 1b9df5db648b9..d2043b02739eb 100644
--- a/Telegram/SourceFiles/history/view/history_view_reply.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_reply.cpp
@@ -583,7 +583,7 @@ QSize Reply::countMultilineOptimalSize(
 		textGeometry(max, previewSkip, &elided));
 	_minHeightExpandable = elided ? 1 : 0;
 	return {
-		result.width,
+		result.width + st::historyReplyPadding.right(),
 		std::max(result.height, st::normalFont->height),
 	};
 }

From 2afb69e7878cb71085748a755aeab0415068746c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 01:28:46 +0300
Subject: [PATCH 072/400] Fixed text state of reply bubble for messages with
 unwrapped media.

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

diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
index b0dba7ecbb5bd..4c9e3277c9fb8 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
@@ -441,7 +441,7 @@ TextState UnwrappedMedia::textState(QPoint point, StateRequest request) const {
 			}
 			if (recth) {
 				int rectx = _additionalOnTop
-					? (rightAligned ? (inner.width() + st::msgReplyPadding.left() - rectw) : 0)
+					? (rightAligned ? (inner.x() + inner.width() - rectw) : 0)
 					: (rightAligned ? 0 : (inner.width() + st::msgReplyPadding.left()));
 				int recty = surrounding.height - recth;
 				if (rtl()) rectx = width() - rectx - rectw;

From 41e414af37fe09e35686c57a205cb144fc9631e6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 02:52:18 +0300
Subject: [PATCH 073/400] Removed transcribe buttons from scheduled messages.

---
 .../SourceFiles/history/view/media/history_view_document.cpp     | 1 +
 Telegram/SourceFiles/history/view/media/history_view_gif.cpp     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index b7714d579248a..bb64302c74b0e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -440,6 +440,7 @@ QSize Document::countOptimalSize() {
 		const auto session = &history->session();
 		const auto transcribes = &session->api().transcribes();
 		if (_parent->data()->media()->ttlSeconds()
+			|| _realParent->isScheduled()
 			|| (!session->premium()
 				&& !transcribes->freeFor(_realParent)
 				&& !transcribes->trialsSupport())) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index bda09fe8da6e3..2097ca1b564b6 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -2063,6 +2063,7 @@ bool Gif::needCornerStatusDisplay() const {
 void Gif::ensureTranscribeButton() const {
 	if (_data->isVideoMessage()
 		&& !_parent->data()->media()->ttlSeconds()
+		&& !_parent->data()->isScheduled()
 		&& (_data->session().premium()
 			|| _data->session().api().transcribes().trialsSupport())) {
 		if (!_transcribe) {

From c1c49e8ddccd85b6a67162d7d61c515eaf3ca5f8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 03:45:49 +0300
Subject: [PATCH 074/400] Added captions to voice messages in overview layout.

---
 .../SourceFiles/overview/overview_layout.cpp  | 26 +++++++++++++++++++
 .../SourceFiles/overview/overview_layout.h    |  4 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index e75af14641b1f..6bbacb1d88192 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "overview/overview_layout.h"
 
 #include "overview/overview_layout_delegate.h"
+#include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_document.h"
 #include "data/data_document_resolver.h"
 #include "data/data_session.h"
@@ -867,6 +868,7 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			p.drawTextLeft(nameleft, statustop, _width, _status.text(), statusw);
 			unreadx += statusw;
 		}
+		auto captionLeft = unreadx + st::mediaUnreadSkip;
 		if (parent()->hasUnreadMediaFlag() && unreadx + st::mediaUnreadSkip + st::mediaUnreadSize <= _width) {
 			p.setPen(Qt::NoPen);
 			p.setBrush(selected ? st::msgFileInBgSelected : st::msgFileInBg);
@@ -875,6 +877,22 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 				PainterHighQualityEnabler hq(p);
 				p.drawEllipse(style::rtlrect(unreadx + st::mediaUnreadSkip, statustop + st::mediaUnreadTop, st::mediaUnreadSize, st::mediaUnreadSize, _width));
 			}
+			captionLeft += st::mediaUnreadSkip + st::mediaUnreadSize;
+		}
+		if (!_caption.isEmpty()) {
+			p.setPen(st::historyFileNameInFg);
+			const auto w = _width - captionLeft - st::defaultScrollArea.width;
+			_caption.draw(p, Ui::Text::PaintContext{
+				.position = QPoint(captionLeft, statustop),
+				.availableWidth = w,
+				.spoiler = Ui::Text::DefaultSpoilerCache(),
+				.paused = context
+					? context->paused
+					: On(PowerSaving::kEmojiChat),
+				.pausedEmoji = On(PowerSaving::kEmojiChat),
+				.pausedSpoiler = On(PowerSaving::kChatSpoiler),
+				.elisionLines = 1,
+			});
 		}
 	}
 
@@ -1005,6 +1023,14 @@ void Voice::updateName() {
 			Ui::NameTextOptions());
 	}
 	_nameVersion = parent()->fromOriginal()->nameVersion();
+	_caption.setMarkedText(
+		st::defaultTextStyle,
+		parent()->originalText(),
+		Ui::DialogTextOptions(),
+		Core::MarkedTextContext{
+			.session = &parent()->history()->session(),
+			.customEmojiRepaint = [=] { delegate()->repaintItem(this); },
+		});
 }
 
 bool Voice::updateStatusText() {
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index 3526b5e57c6da..936379e36b305 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -362,7 +362,9 @@ class Voice final : public RadialProgressItem {
 
 	const style::OverviewFileLayout &_st;
 
-	Ui::Text::String _name, _details;
+	Ui::Text::String _name;
+	Ui::Text::String _details;
+	Ui::Text::String _caption;
 	int _nameVersion = 0;
 
 	void updateName();

From b406e2b99b98e5828069e6ecfaef2bcfb0ad3fb5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 04:04:07 +0300
Subject: [PATCH 075/400] Fixed sender name for voices in overview layout when
 sender is hidden.

---
 .../history/view/history_view_message.cpp     |  2 +-
 .../SourceFiles/overview/overview_layout.cpp  | 33 ++++++++-----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 67f10c0336387..4eddd3b49da33 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -3826,7 +3826,7 @@ void Message::fromNameUpdated(int width) const {
 			const auto nameText = [&]() -> const Ui::Text::String * {
 				if (from) {
 					return &_fromName;
-				} else if (const auto info= item->originalHiddenSenderInfo()) {
+				} else if (const auto info = item->originalHiddenSenderInfo()) {
 					return &info->nameText();
 				} else {
 					Unexpected("Corrupted forwarded information in message.");
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 6bbacb1d88192..c56582bc4219e 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -13,7 +13,6 @@ For license and copyright information please follow this link:
 #include "data/data_document_resolver.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
-#include "data/data_media_types.h"
 #include "data/data_peer.h"
 #include "data/data_photo_media.h"
 #include "data/data_document_media.h"
@@ -21,9 +20,7 @@ For license and copyright information please follow this link:
 #include "ui/boxes/confirm_box.h"
 #include "lang/lang_keys.h"
 #include "layout/layout_selection.h"
-#include "mainwidget.h"
 #include "storage/file_upload.h"
-#include "mainwindow.h"
 #include "main/main_session.h"
 #include "media/audio/media_audio.h"
 #include "media/player/media_player_instance.h"
@@ -999,23 +996,19 @@ const style::RoundCheckbox &Voice::checkboxStyle() const {
 
 void Voice::updateName() {
 	if (const auto forwarded = parent()->Get<HistoryMessageForwarded>()) {
-		if (parent()->fromOriginal()->isChannel()) {
-			_name.setText(
-				st::semiboldTextStyle,
-				tr::lng_forwarded_channel(
-					tr::now,
-					lt_channel,
-					parent()->fromOriginal()->name()),
-				Ui::NameTextOptions());
-		} else {
-			_name.setText(
-				st::semiboldTextStyle,
-				tr::lng_forwarded(
-					tr::now,
-					lt_user,
-					parent()->fromOriginal()->name()),
-				Ui::NameTextOptions());
-		}
+		const auto info = parent()->originalHiddenSenderInfo();
+		const auto name = info
+			? tr::lng_forwarded(tr::now, lt_user, info->nameText().toString())
+			: parent()->fromOriginal()->isChannel()
+			? tr::lng_forwarded_channel(
+				tr::now,
+				lt_channel,
+				parent()->fromOriginal()->name())
+			: tr::lng_forwarded(
+				tr::now,
+				lt_user,
+				parent()->fromOriginal()->name());
+		_name.setText(st::semiboldTextStyle, name, Ui::NameTextOptions());
 	} else {
 		_name.setText(
 			st::semiboldTextStyle,

From e4323ecd26f9bcabae3181f957a13b524766d5af Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 07:07:59 +0300
Subject: [PATCH 076/400] Slightly improved code style in processing of api
 text entities.

---
 .../SourceFiles/api/api_text_entities.cpp     | 302 +++++++++++++-----
 1 file changed, 224 insertions(+), 78 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_text_entities.cpp b/Telegram/SourceFiles/api/api_text_entities.cpp
index 6c434bc9bab33..44a689ff4be25 100644
--- a/Telegram/SourceFiles/api/api_text_entities.cpp
+++ b/Telegram/SourceFiles/api/api_text_entities.cpp
@@ -7,12 +7,12 @@ For license and copyright information please follow this link:
 */
 #include "api/api_text_entities.h"
 
-#include "main/main_session.h"
-#include "data/stickers/data_custom_emoji.h"
-#include "data/stickers/data_stickers_set.h"
-#include "data/data_session.h"
 #include "data/data_document.h"
+#include "data/data_session.h"
 #include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/stickers/data_stickers_set.h"
+#include "main/main_session.h"
 
 namespace Api {
 namespace {
@@ -62,67 +62,163 @@ using namespace TextUtilities;
 EntitiesInText EntitiesFromMTP(
 		Main::Session *session,
 		const QVector<MTPMessageEntity> &entities) {
+	if (entities.isEmpty()) {
+		return {};
+	}
 	auto result = EntitiesInText();
-	if (!entities.isEmpty()) {
-		result.reserve(entities.size());
-		for (const auto &entity : entities) {
-			switch (entity.type()) {
-			case mtpc_messageEntityUrl: { auto &d = entity.c_messageEntityUrl(); result.push_back({ EntityType::Url, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityTextUrl: { auto &d = entity.c_messageEntityTextUrl(); result.push_back({ EntityType::CustomUrl, d.voffset().v, d.vlength().v, qs(d.vurl()) }); } break;
-			case mtpc_messageEntityEmail: { auto &d = entity.c_messageEntityEmail(); result.push_back({ EntityType::Email, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityHashtag: { auto &d = entity.c_messageEntityHashtag(); result.push_back({ EntityType::Hashtag, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityCashtag: { auto &d = entity.c_messageEntityCashtag(); result.push_back({ EntityType::Cashtag, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityPhone: break; // Skipping phones.
-			case mtpc_messageEntityMention: { auto &d = entity.c_messageEntityMention(); result.push_back({ EntityType::Mention, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityMentionName: if (session) {
-				const auto &d = entity.c_messageEntityMentionName();
-				const auto userId = UserId(d.vuser_id());
-				const auto user = session->data().userLoaded(userId);
-				const auto data = MentionNameDataFromFields({
+	result.reserve(entities.size());
+
+	for (const auto &entity : entities) {
+		entity.match([&](const MTPDmessageEntityUnknown &d) {
+		}, [&](const MTPDmessageEntityMention &d) {
+			result.push_back({
+				EntityType::Mention,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityHashtag &d) {
+			result.push_back({
+				EntityType::Hashtag,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityBotCommand &d) {
+			result.push_back({
+				EntityType::BotCommand,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityUrl &d) {
+			result.push_back({
+				EntityType::Url,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityEmail &d) {
+			result.push_back({
+				EntityType::Email,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityBold &d) {
+			result.push_back({
+				EntityType::Bold,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityItalic &d) {
+			result.push_back({
+				EntityType::Italic,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityCode &d) {
+			result.push_back({
+				EntityType::Code,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityPre &d) {
+			result.push_back({
+				EntityType::Pre,
+				d.voffset().v,
+				d.vlength().v,
+				qs(d.vlanguage()),
+			});
+		}, [&](const MTPDmessageEntityTextUrl &d) {
+			result.push_back({
+				EntityType::CustomUrl,
+				d.voffset().v,
+				d.vlength().v,
+				qs(d.vurl()),
+			});
+		}, [&](const MTPDmessageEntityMentionName &d) {
+			if (!session) {
+				return;
+			}
+			const auto userId = UserId(d.vuser_id());
+			const auto user = session->data().userLoaded(userId);
+			const auto data = MentionNameDataFromFields({
+				.selfId = session->userId().bare,
+				.userId = userId.bare,
+				.accessHash = user ? user->accessHash() : 0,
+			});
+			result.push_back({
+				EntityType::MentionName,
+				d.voffset().v,
+				d.vlength().v,
+				data,
+			});
+		}, [&](const MTPDinputMessageEntityMentionName &d) {
+			if (!session) {
+				return;
+			}
+			const auto data = d.vuser_id().match([&](
+					const MTPDinputUserSelf &) {
+				return MentionNameDataFromFields({
+					.selfId = session->userId().bare,
+					.userId = session->userId().bare,
+					.accessHash = session->user()->accessHash(),
+				});
+			}, [&](const MTPDinputUser &data) {
+				return MentionNameDataFromFields({
 					.selfId = session->userId().bare,
-					.userId = userId.bare,
-					.accessHash = user ? user->accessHash() : 0,
+					.userId = UserId(data.vuser_id()).bare,
+					.accessHash = data.vaccess_hash().v,
 				});
-				result.push_back({ EntityType::MentionName, d.voffset().v, d.vlength().v, data });
-			} break;
-			case mtpc_inputMessageEntityMentionName: if (session) {
-				const auto &d = entity.c_inputMessageEntityMentionName();
-				const auto data = d.vuser_id().match([&](
-						const MTPDinputUserSelf &) {
-					return MentionNameDataFromFields({
-						.selfId = session->userId().bare,
-						.userId = session->userId().bare,
-						.accessHash = session->user()->accessHash(),
-					});
-				}, [&](const MTPDinputUser &data) {
-					return MentionNameDataFromFields({
-						.selfId = session->userId().bare,
-						.userId = UserId(data.vuser_id()).bare,
-						.accessHash = data.vaccess_hash().v,
-					});
-				}, [&](const auto &) {
-					return QString();
+			}, [](const auto &) {
+				return QString();
+			});
+			if (!data.isEmpty()) {
+				result.push_back({
+					EntityType::MentionName,
+					d.voffset().v,
+					d.vlength().v,
+					data,
 				});
-				if (!data.isEmpty()) {
-					result.push_back({ EntityType::MentionName, d.voffset().v, d.vlength().v, data });
-				}
-			} break;
-			case mtpc_messageEntityBotCommand: { auto &d = entity.c_messageEntityBotCommand(); result.push_back({ EntityType::BotCommand, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityBold: { auto &d = entity.c_messageEntityBold(); result.push_back({ EntityType::Bold, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityItalic: { auto &d = entity.c_messageEntityItalic(); result.push_back({ EntityType::Italic, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityUnderline: { auto &d = entity.c_messageEntityUnderline(); result.push_back({ EntityType::Underline, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityStrike: { auto &d = entity.c_messageEntityStrike(); result.push_back({ EntityType::StrikeOut, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityCode: { auto &d = entity.c_messageEntityCode(); result.push_back({ EntityType::Code, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityPre: { auto &d = entity.c_messageEntityPre(); result.push_back({ EntityType::Pre, d.voffset().v, d.vlength().v, qs(d.vlanguage()) }); } break;
-			case mtpc_messageEntityBlockquote: { auto &d = entity.c_messageEntityBlockquote(); result.push_back({ EntityType::Blockquote, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityBankCard: break; // Skipping cards. // #TODO entities
-			case mtpc_messageEntitySpoiler: { auto &d = entity.c_messageEntitySpoiler(); result.push_back({ EntityType::Spoiler, d.voffset().v, d.vlength().v }); } break;
-			case mtpc_messageEntityCustomEmoji: {
-				const auto &d = entity.c_messageEntityCustomEmoji();
-				result.push_back({ EntityType::CustomEmoji, d.voffset().v, d.vlength().v, CustomEmojiEntityData(d) });
-			} break;
 			}
-		}
+		}, [&](const MTPDmessageEntityPhone &d) {
+			// Skipping phones.
+		}, [&](const MTPDmessageEntityCashtag &d) {
+			result.push_back({
+				EntityType::Cashtag,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityUnderline &d) {
+			result.push_back({
+				EntityType::Underline,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityStrike &d) {
+			result.push_back({
+				EntityType::StrikeOut,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityBankCard &d) {
+			// Skipping cards. // #TODO entities
+		}, [&](const MTPDmessageEntitySpoiler &d) {
+			result.push_back({
+				EntityType::Spoiler,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityCustomEmoji &d) {
+			result.push_back({
+				EntityType::CustomEmoji,
+				d.voffset().v,
+				d.vlength().v,
+				CustomEmojiEntityData(d),
+			});
+		}, [&](const MTPDmessageEntityBlockquote &d) {
+			result.push_back({
+				EntityType::Blockquote,
+				d.voffset().v,
+				d.vlength().v,
+			});
+		});
 	}
 	return result;
 }
@@ -134,7 +230,9 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 	auto v = QVector<MTPMessageEntity>();
 	v.reserve(entities.size());
 	for (const auto &entity : entities) {
-		if (entity.length() <= 0) continue;
+		if (entity.length() <= 0) {
+			continue;
+		}
 		if (option == ConvertOption::SkipLocal
 			&& entity.type() != EntityType::Bold
 			//&& entity.type() != EntityType::Semibold // Not in API.
@@ -154,28 +252,76 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 		auto offset = MTP_int(entity.offset());
 		auto length = MTP_int(entity.length());
 		switch (entity.type()) {
-		case EntityType::Url: v.push_back(MTP_messageEntityUrl(offset, length)); break;
-		case EntityType::CustomUrl: v.push_back(MTP_messageEntityTextUrl(offset, length, MTP_string(entity.data()))); break;
-		case EntityType::Email: v.push_back(MTP_messageEntityEmail(offset, length)); break;
-		case EntityType::Hashtag: v.push_back(MTP_messageEntityHashtag(offset, length)); break;
-		case EntityType::Cashtag: v.push_back(MTP_messageEntityCashtag(offset, length)); break;
-		case EntityType::Mention: v.push_back(MTP_messageEntityMention(offset, length)); break;
+		case EntityType::Url: {
+			v.push_back(MTP_messageEntityUrl(offset, length));
+		} break;
+		case EntityType::CustomUrl: {
+			v.push_back(
+				MTP_messageEntityTextUrl(
+					offset,
+					length,
+					MTP_string(entity.data())));
+		} break;
+		case EntityType::Email: {
+			v.push_back(MTP_messageEntityEmail(offset, length));
+		} break;
+		case EntityType::Hashtag: {
+			v.push_back(MTP_messageEntityHashtag(offset, length));
+		} break;
+		case EntityType::Cashtag: {
+			v.push_back(MTP_messageEntityCashtag(offset, length));
+		} break;
+		case EntityType::Mention: {
+			v.push_back(MTP_messageEntityMention(offset, length));
+		} break;
 		case EntityType::MentionName: {
-			if (const auto valid = MentionNameEntity(session, offset, length, entity.data())) {
+			const auto valid = MentionNameEntity(
+				session,
+				offset,
+				length,
+				entity.data());
+			if (valid) {
 				v.push_back(*valid);
 			}
 		} break;
-		case EntityType::BotCommand: v.push_back(MTP_messageEntityBotCommand(offset, length)); break;
-		case EntityType::Bold: v.push_back(MTP_messageEntityBold(offset, length)); break;
-		case EntityType::Italic: v.push_back(MTP_messageEntityItalic(offset, length)); break;
-		case EntityType::Underline: v.push_back(MTP_messageEntityUnderline(offset, length)); break;
-		case EntityType::StrikeOut: v.push_back(MTP_messageEntityStrike(offset, length)); break;
-		case EntityType::Code: v.push_back(MTP_messageEntityCode(offset, length)); break; // #TODO entities
-		case EntityType::Pre: v.push_back(MTP_messageEntityPre(offset, length, MTP_string(entity.data()))); break;
-		case EntityType::Blockquote: v.push_back(MTP_messageEntityBlockquote(offset, length)); break;
-		case EntityType::Spoiler: v.push_back(MTP_messageEntitySpoiler(offset, length)); break;
+		case EntityType::BotCommand: {
+			v.push_back(MTP_messageEntityBotCommand(offset, length));
+		} break;
+		case EntityType::Bold: {
+			v.push_back(MTP_messageEntityBold(offset, length));
+		} break;
+		case EntityType::Italic: {
+			v.push_back(MTP_messageEntityItalic(offset, length));
+		} break;
+		case EntityType::Underline: {
+			v.push_back(MTP_messageEntityUnderline(offset, length));
+		} break;
+		case EntityType::StrikeOut: {
+			v.push_back(MTP_messageEntityStrike(offset, length));
+		} break;
+		case EntityType::Code: {
+			// #TODO entities.
+			v.push_back(MTP_messageEntityCode(offset, length));
+		} break;
+		case EntityType::Pre: {
+			v.push_back(
+				MTP_messageEntityPre(
+					offset,
+					length,
+					MTP_string(entity.data())));
+		} break;
+		case EntityType::Blockquote: {
+			v.push_back(MTP_messageEntityBlockquote(offset, length));
+		} break;
+		case EntityType::Spoiler: {
+			v.push_back(MTP_messageEntitySpoiler(offset, length));
+		} break;
 		case EntityType::CustomEmoji: {
-			if (const auto valid = CustomEmojiEntity(offset, length, entity.data())) {
+			const auto valid = CustomEmojiEntity(
+				offset,
+				length,
+				entity.data());
+			if (valid) {
 				v.push_back(*valid);
 			}
 		} break;

From 76137ca1cf622401cbf5dac0138d19d2c58b4b63 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 09:34:58 +0300
Subject: [PATCH 077/400] Fixed link to premium section in box about sponsored
 messages.

---
 Telegram/SourceFiles/menu/menu_sponsored.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index f836106d02ee1..495da6a85626a 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -37,11 +37,13 @@ namespace {
 
 void AboutBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<Main::Session*> session) {
+		std::shared_ptr<ChatHelpers::Show> show) {
 	constexpr auto kUrl = "https://promote.telegram.org"_cs;
 
 	box->setNoContentMargin(true);
 
+	const auto session = &show->session();
+
 	const auto content = box->verticalLayout().get();
 	const auto levels = Data::LevelLimits(session)
 		.channelRestrictSponsoredLevelMin();
@@ -101,7 +103,7 @@ void AboutBox(
 					st::channelEarnSemiboldLabel),
 				padding);
 			Ui::AddSkip(content, st::channelEarnHistoryThreeSkip);
-			content->add(
+			const auto label = content->add(
 				object_ptr<Ui::FlatLabel>(
 					content,
 					std::move(about),
@@ -121,6 +123,7 @@ void AboutBox(
 					(g.left() - left->width()) / 2,
 					g.top() + st::channelEarnHistoryThreeSkip);
 			}, left->lifetime());
+			return label;
 		};
 		addEntry(
 			tr::lng_sponsored_revenued_info1_title(),
@@ -144,10 +147,14 @@ void AboutBox(
 				lt_link,
 				tr::lng_settings_privacy_premium_link(
 				) | rpl::map([=](QString t) {
-					return Ui::Text::Link(t, kUrl.utf16());
+					return Ui::Text::Link(std::move(t), u"internal:"_q);
 				}),
 				Ui::Text::RichLangValue),
-			st::sponsoredAboutRemoveIcon);
+			st::sponsoredAboutRemoveIcon)->setClickHandlerFilter([=](
+					const auto &...) {
+				ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
+				return true;
+			});
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 	}
@@ -339,7 +346,7 @@ void ShowSponsored(
 		st::popupMenuWithIcons);
 
 	menu->addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
-		show->show(Box(AboutBox, &item->history()->session()));
+		show->show(Box(AboutBox, show));
 	}, &st::menuIconInfo);
 
 	menu->addAction(tr::lng_sponsored_menu_revenued_report(tr::now), [=] {
@@ -363,7 +370,7 @@ void ShowSponsored(
 
 void ShowSponsoredAbout(std::shared_ptr<ChatHelpers::Show> show) {
 	show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
-		AboutBox(box, &show->session());
+		AboutBox(box, show);
 	}));
 }
 

From 264e35a6a86809be1854eea5e82634faa6c5fabb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 14 May 2024 17:16:02 +0300
Subject: [PATCH 078/400] Fixed rare crash in photo editor when editing media
 in message.

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

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 5ffdfb6f36175..be4d4e7fad85f 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -206,6 +206,9 @@ void EditPhotoImage(
 		Storage::UpdateImageDetails(file, previewWidth, sideLimit);
 		done(std::move(list));
 	};
+	if (!large) {
+		return;
+	}
 	const auto fileImage = std::make_shared<Image>(*large);
 	auto editor = base::make_unique_q<Editor::PhotoEditor>(
 		parent,

From 213326a212ca4096b224c6db2e672f3622e965bf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 May 2024 18:15:02 +0400
Subject: [PATCH 079/400] Update submodules.

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

diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index 1cbf5fa7d8750..f701713cd798b 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit 1cbf5fa7d875074c40e76216a3047bd7c59996d7
+Subproject commit f701713cd798bd7d5f69d318fdefb125d101aa76
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 2ccbfa5f34432..6db384204054d 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 2ccbfa5f3443274e40deb761674b536e2e8eedae
+Subproject commit 6db384204054d853b30ba887d448a5a3ea4077c0

From b5f5aed1197aae6bccdeaef958d663fd5af41904 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 8 May 2024 09:30:59 +0400
Subject: [PATCH 080/400] Fix search focus in a hidden window on launch.

Fixes #27853.
---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 Telegram/build/prepare/prepare.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 350c7a3fd5621..d48e997101e92 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 44f5103860dfa3f9b9675730231af6fbe28cde93 \
+	&& git fetch --depth=1 origin 1b3aa9303260613841745a71442c939b55c8aaf2 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index ce6c87b9bf1fb..9a3d0587ed99a 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -435,7 +435,7 @@ def runStages():
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 5d64e21844
+    git checkout 1b3aa93032
 """)
 
 stage('msys64', """

From 1f31d8032f752c90800255dfcfe3f3137a3beb0d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 8 May 2024 17:16:34 +0400
Subject: [PATCH 081/400] Bring chosen font to the top of the box.

---
 Telegram/SourceFiles/ui/boxes/choose_font_box.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index 512e8a6915823..80168ca0fd412 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -546,15 +546,25 @@ std::vector<Selector::Entry> Selector::FullList(const QString &now) {
 			result.push_back({ .id = family });
 		}
 	}
-	if (!ranges::contains(result, now, &Entry::id)) {
+	auto nowIt = ranges::find(result, now, &Entry::id);
+	if (nowIt == end(result)) {
 		result.push_back({ .id = now });
+		nowIt = end(result) - 1;
 	}
 	for (auto i = begin(result) + 2; i != end(result); ++i) {
 		i->key = TextUtilities::RemoveAccents(i->id).toLower();
 		i->text = i->id;
 		i->keywords = TextUtilities::PrepareSearchWords(i->id);
 	}
-	ranges::sort(begin(result) + 2, end(result), std::less<>(), &Entry::key);
+	auto skip = 2;
+	if (nowIt - begin(result) >= skip) {
+		std::swap(result[2], *nowIt);
+		++skip;
+	}
+	ranges::sort(
+		begin(result) + skip, end(result),
+		std::less<>(),
+		&Entry::key);
 	return result;
 }
 

From 88ad1be4c303d02fa9e2a24d88b246b7b648e6e1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 9 May 2024 11:12:01 +0400
Subject: [PATCH 082/400] Try to fix custom fonts in the input field.

---
 Telegram/SourceFiles/chat_helpers/chat_helpers.style | 2 +-
 Telegram/build/docker/centos_env/Dockerfile          | 2 +-
 Telegram/build/prepare/prepare.py                    | 2 +-
 Telegram/lib_ui                                      | 2 +-
 snap/snapcraft.yaml                                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 67358e4c97000..f8c8ad61b48ff 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -983,7 +983,7 @@ historyComposeField: InputField(defaultInputField) {
 	placeholderFg: placeholderFg;
 	placeholderFgActive: placeholderFgActive;
 	placeholderFgError: placeholderFgActive;
-	placeholderMargins: margins(7px, 5px, 7px, 5px);
+	placeholderMargins: margins(2px, 0px, 2px, 0px);
 	placeholderAlign: align(topleft);
 	placeholderScale: 0.;
 	placeholderFont: normalFont;
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index d48e997101e92..251123360012c 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 1b3aa9303260613841745a71442c939b55c8aaf2 \
+	&& git fetch --depth=1 origin 25f76cf4d58fae5742447d17d2574ab1fad196e5 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 9a3d0587ed99a..8384492e62bea 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -435,7 +435,7 @@ def runStages():
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 1b3aa93032
+    git checkout 25f76cf4d5
 """)
 
 stage('msys64', """
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f76ddd841ca02..41d1fe9232c1d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f76ddd841ca02ca35432f6de569f8c430a9713b1
+Subproject commit 41d1fe9232c1d09b1ada01a0cc552e5c66d74b89
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 79148548e7fb9..95f560866e860 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -167,7 +167,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 44f5103860dfa3f9b9675730231af6fbe28cde93
+    source-commit: 25f76cf4d58fae5742447d17d2574ab1fad196e5
     plugin: dump
     override-pull: |
       craftctl default

From bd48e2fff2a4f83834d53f7651cfd6abc7355e7c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 16 May 2024 19:13:21 +0400
Subject: [PATCH 083/400] Fix more package names in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 95f560866e860..531d3d14dd9a8 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -115,13 +115,13 @@ parts:
       - libasound2
       - libavif16
       - libboost-regex1.83.0
-      - libglib2.0-0
+      - libglib2.0-0t64
       - libheif1
       - libopenal1
       - libopus0
-      - libprotobuf-lite32
+      - libprotobuf-lite32t64
       - libpulse0
-      - libssl3
+      - libssl3t64
       - libwayland-client0
       - libwebkitgtk-6.0-4
       - libxcb1
@@ -322,7 +322,7 @@ parts:
       - libegl1
       - libfontconfig1
       - libfreetype6
-      - libglib2.0-0
+      - libglib2.0-0t64
       - libglx0
       - libgtk-3-0t64
       - libharfbuzz0b
@@ -333,7 +333,7 @@ parts:
       - libpcre2-16-0
       - libpng16-16t64
       - libsm6
-      - libssl3
+      - libssl3t64
       - libvulkan1
       - libwayland-client0
       - libwayland-cursor0
@@ -465,10 +465,10 @@ parts:
       - libegl1
       - libgbm1
       - libgl1
-      - libglib2.0-0
+      - libglib2.0-0t64
       - libopenh264-7
       - libopus0
-      - libssl3
+      - libssl3t64
       - libvpx9
       - libx11-6
       - libxcomposite1

From a753c1515bd9bd069cee9285a8a47b140c010d2f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 16 May 2024 19:13:42 +0400
Subject: [PATCH 084/400] Remove unneeded wayland-client dependency from
 telegram part in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 531d3d14dd9a8..b65e2e06d3cfd 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -105,7 +105,6 @@ parts:
       - libprotobuf-dev
       - libpulse-dev
       - libssl-dev
-      - libwayland-dev
       - libxcb1-dev
       - libxcb-keysyms1-dev
       - libxcb-record0-dev
@@ -122,7 +121,6 @@ parts:
       - libprotobuf-lite32t64
       - libpulse0
       - libssl3t64
-      - libwayland-client0
       - libwebkitgtk-6.0-4
       - libxcb1
       - libxcb-keysyms1

From ad13048cdc7f6ed64980634af83de07e7da5494b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 16 May 2024 19:15:56 +0400
Subject: [PATCH 085/400] Update submodules

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 41d1fe9232c1d..72a1c98fa6470 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 41d1fe9232c1d09b1ada01a0cc552e5c66d74b89
+Subproject commit 72a1c98fa6470f160d0d81cca9a1b123821e8e0f
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 6db384204054d..3cc1c1c1619a2 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 6db384204054d853b30ba887d448a5a3ea4077c0
+Subproject commit 3cc1c1c1619a2c23bcc9500ddb2ca1231a5db5b5
diff --git a/cmake b/cmake
index d9f958e0ba4ee..a7527c0e6eba1 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit d9f958e0ba4eef6359b0c968ca4fc75923134f78
+Subproject commit a7527c0e6eba1c71cd0dfd7bd8de9c1e68cb529f

From 98b58c1168a380dff4bf9192abdd420008c0daa1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 18 May 2024 01:02:49 +0400
Subject: [PATCH 086/400] Add missing binds for OpenGL shaders and buffers

---
 Telegram/SourceFiles/calls/calls_video_incoming.cpp          | 1 +
 .../SourceFiles/calls/group/calls_group_viewport_opengl.cpp  | 2 ++
 .../SourceFiles/media/view/media_view_overlay_opengl.cpp     | 5 +++++
 Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp    | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/Telegram/SourceFiles/calls/calls_video_incoming.cpp b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
index 9ab16d73d42df..e1a52ebe9065d 100644
--- a/Telegram/SourceFiles/calls/calls_video_incoming.cpp
+++ b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
@@ -331,6 +331,7 @@ void Panel::Incoming::RendererGL::paint(
 		shadow.texture.left(), shadow.texture.top(),
 	};
 
+	_contentBuffer->bind();
 	_contentBuffer->write(0, coords, sizeof(coords));
 
 	const auto bottomShadowArea = QRect(
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
index 63e5105fa914e..6f6b076204b68 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
@@ -783,6 +783,7 @@ void Viewport::RendererGL::paintTile(
 		: &*_frameProgram.yuv420;
 	const auto uniformViewport = QSizeF(_viewport) * _factor;
 
+	program->bind();
 	program->setUniformValue("viewport", uniformViewport);
 	program->setUniformValue(
 		"frameBg",
@@ -1078,6 +1079,7 @@ void Viewport::RendererGL::drawDownscalePass(
 		? &*_downscaleProgram.argb32
 		: &*_downscaleProgram.yuv420;
 
+	program->bind();
 	FillTexturedRectangle(f, program);
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 31ea352379ba5..99be5557f6f76 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -544,6 +544,7 @@ void OverlayWidget::RendererGL::paintTransformedContent(
 		0.f, 0.f,
 	};
 
+	_contentBuffer->bind();
 	_contentBuffer->write(0, coords, sizeof(coords));
 
 	program->setUniformValue("viewport", _uniformViewport);
@@ -712,6 +713,7 @@ void OverlayWidget::RendererGL::paintControl(
 	};
 	_controlsProgram->bind();
 	_controlsProgram->setUniformValue("viewport", _uniformViewport);
+	_contentBuffer->bind();
 	if (!over.isEmpty() && overOpacity > 0) {
 		_contentBuffer->write(
 			offset * 4 * sizeof(GLfloat),
@@ -915,6 +917,7 @@ void OverlayWidget::RendererGL::paintRoundedCorners(int radius) {
 	const auto offset = kControlsOffset
 		+ (kControlsCount * kControlValues) / 4;
 	const auto byteOffset = offset * 4 * sizeof(GLfloat);
+	_contentBuffer->bind();
 	_contentBuffer->write(byteOffset, coords, sizeof(coords));
 	_roundedCornersProgram->bind();
 	_roundedCornersProgram->setUniformValue("viewport", _uniformViewport);
@@ -981,6 +984,7 @@ void OverlayWidget::RendererGL::paintStoriesSiblingPart(
 		+ (6 * 2 * 4) / 4 // rounding
 		+ (index * 4);
 	const auto byteOffset = offset * 4 * sizeof(GLfloat);
+	_contentBuffer->bind();
 	_contentBuffer->write(byteOffset, coords, sizeof(coords));
 
 	_controlsProgram->bind();
@@ -1059,6 +1063,7 @@ void OverlayWidget::RendererGL::paintUsingRaster(
 		geometry.left(), geometry.bottom(),
 		textured.texture.left(), textured.texture.top(),
 	};
+	_contentBuffer->bind();
 	_contentBuffer->write(
 		bufferOffset * 4 * sizeof(GLfloat),
 		coords,
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
index 8e4e8e7c2c5ac..f4be398c20b76 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
@@ -427,6 +427,7 @@ void Pip::RendererGL::paintTransformedContent(
 		(geometry.outer.height() - geometry.inner.y()) * yscale,
 	};
 
+	_contentBuffer->bind();
 	_contentBuffer->write(0, coords, sizeof(coords));
 
 	const auto rgbaFrame = _chromaSize.isEmpty();
@@ -588,6 +589,7 @@ void Pip::RendererGL::paintButton(
 		iconOverRect.texture.right(), iconOverRect.texture.top(),
 		iconOverRect.texture.left(), iconOverRect.texture.top(),
 	};
+	_contentBuffer->bind();
 	_contentBuffer->write(
 		offset * 4 * sizeof(GLfloat),
 		coords,
@@ -741,6 +743,7 @@ void Pip::RendererGL::paintUsingRaster(
 		geometry.left(), geometry.bottom(),
 		textured.texture.left(), textured.texture.top(),
 	};
+	_contentBuffer->bind();
 	_contentBuffer->write(
 		bufferOffset * 4 * sizeof(GLfloat),
 		coords,

From 65b62485be4a7ce1f584b84231f69d829743b61c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 17 May 2024 03:24:20 +0400
Subject: [PATCH 087/400] Forward input method event from Dialogs::Widget to
 search field

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 28 +++++++++++++++++++
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  3 ++
 2 files changed, 31 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 575516ffa0284..6e5c30b7b36a1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -82,6 +82,7 @@ For license and copyright information please follow this link:
 #include "base/qt/qt_common_adapters.h"
 
 #include <QtCore/QMimeData>
+#include <QtGui/QTextBlock>
 #include <QtWidgets/QScrollBar>
 #include <QtWidgets/QTextEdit>
 
@@ -239,6 +240,8 @@ Widget::Widget(
 	: nullptr)
 , _searchTimer([=] { searchMessages(); })
 , _singleMessageSearch(&controller->session()) {
+	setAttribute(Qt::WA_InputMethodEnabled);
+
 	const auto makeChildListShown = [](PeerId peerId, float64 shown) {
 		return InnerWidget::ChildListShown{ peerId, shown };
 	};
@@ -3298,6 +3301,31 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
+void Widget::inputMethodEvent(QInputMethodEvent *e) {
+	const auto cursor = _search->rawTextEdit()->textCursor();
+	bool isGettingInput = !e->commitString().isEmpty()
+		|| e->preeditString() != cursor.block().layout()->preeditAreaText()
+		|| e->replacementLength() > 0;
+
+	if (!isGettingInput || _postponeProcessSearchFocusChange) {
+		Window::AbstractSectionWidget::inputMethodEvent(e);
+		return;
+	}
+
+	// This delay in search focus processing allows us not to create
+	// _suggestions in case the event inserts some non-whitespace search
+	// query while still show _suggestions animated, if it is a space.
+	_postponeProcessSearchFocusChange = true;
+	_search->setFocusFast();
+	QCoreApplication::sendEvent(_search->rawTextEdit(), e);
+	_postponeProcessSearchFocusChange = false;
+	processSearchFocusChange();
+}
+
+QVariant Widget::inputMethodQuery(Qt::InputMethodQuery query) const {
+	return _search->rawTextEdit()->inputMethodQuery(query);
+}
+
 bool Widget::redirectToSearchPossible() const {
 	return !_openedFolder
 		&& !_openedForum
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 5ff9828d5aec4..aa6dbdf93487a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -135,6 +135,8 @@ class Widget final : public Window::AbstractSectionWidget {
 	bool cancelSearch();
 	bool cancelSearchByMouseBack();
 
+	QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
+
 	~Widget();
 
 protected:
@@ -144,6 +146,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	void dropEvent(QDropEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 	void keyPressEvent(QKeyEvent *e) override;
+	void inputMethodEvent(QInputMethodEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
 
 private:

From af4e0178d0d4efdb87898386c0aa56ad6bd8ffc7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 19 May 2024 15:29:31 +0400
Subject: [PATCH 088/400] Ensure window flags are set before calling
 SeparatePanel::setInnerSize

Setting window flags may lead to native window being re-created
---
 Telegram/SourceFiles/payments/ui/payments_panel.cpp        | 2 +-
 Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp | 2 +-
 Telegram/lib_webview                                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index f509fdb706762..7813a82440f2b 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -70,8 +70,8 @@ Panel::Progress::Progress(QWidget *parent, Fn<QRect()> rect)
 Panel::Panel(not_null<PanelDelegate*> delegate)
 : _delegate(delegate)
 , _widget(std::make_unique<SeparatePanel>()) {
-	_widget->setInnerSize(st::paymentsPanelSize);
 	_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
+	_widget->setInnerSize(st::paymentsPanelSize);
 
 	_widget->closeRequests(
 	) | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index a18c86bf2b99d..747c812e440b6 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -323,8 +323,8 @@ Panel::Panel(
 , _menuButtons(menuButtons)
 , _widget(std::make_unique<SeparatePanel>())
 , _allowClipboardRead(allowClipboardRead) {
-	_widget->setInnerSize(st::botWebViewPanelSize);
 	_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
+	_widget->setInnerSize(st::botWebViewPanelSize);
 
 	_widget->closeRequests(
 	) | rpl::start_with_next([=] {
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 3cc1c1c1619a2..ebaa206b1d2f1 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 3cc1c1c1619a2c23bcc9500ddb2ca1231a5db5b5
+Subproject commit ebaa206b1d2f1f24cff08f3c8a73054ee69274f0

From 6734f99ba8b46b716beab112f98ff1551f47c2e2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 19 May 2024 20:14:15 +0400
Subject: [PATCH 089/400] Update lib_ui & patches on Linux

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 251123360012c..1f623e190d24c 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 25f76cf4d58fae5742447d17d2574ab1fad196e5 \
+	&& git fetch --depth=1 origin 931535985f75ca51313923d31d7924560719b3eb \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 72a1c98fa6470..037ceb272c4dd 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 72a1c98fa6470f160d0d81cca9a1b123821e8e0f
+Subproject commit 037ceb272c4dd2eb456e18b61e374c1fa759d109
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b65e2e06d3cfd..7a6fc8ffa0466 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -165,7 +165,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 25f76cf4d58fae5742447d17d2574ab1fad196e5
+    source-commit: 931535985f75ca51313923d31d7924560719b3eb
     plugin: dump
     override-pull: |
       craftctl default

From 2bdc204c4761178ca502cbad02a42aee08955cda Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 13:34:05 +0400
Subject: [PATCH 090/400] Fix geometry applying in webview windows.

---
 .../payments/ui/payments_panel.cpp            | 21 +++++----
 .../SourceFiles/payments/ui/payments_panel.h  |  2 +
 .../ui/chat/attach/attach_bot_webview.cpp     | 46 ++++++++++---------
 .../ui/chat/attach/attach_bot_webview.h       |  4 +-
 4 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index 7813a82440f2b..d97628285e9d9 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -534,12 +534,15 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	const auto bottom = _webviewBottom.get();
 	bottom->show();
 
-	bottom->heightValue(
-	) | rpl::start_with_next([=](int height) {
-		const auto inner = _widget->innerGeometry();
+	rpl::combine(
+		container->geometryValue() | rpl::map([=] {
+			return _widget->innerGeometry();
+		}),
+		bottom->heightValue()
+	) | rpl::start_with_next([=](QRect inner, int height) {
 		bottom->move(inner.x(), inner.y() + inner.height() - height);
-		container->resize(inner.width(), inner.height() - height);
 		bottom->resizeToWidth(inner.width());
+		_footerHeight = bottom->height();
 	}, bottom->lifetime());
 	container->show();
 
@@ -584,10 +587,12 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 		});
 	});
 
-	container->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
-		if (raw->widget()) {
-			raw->widget()->setGeometry(geometry);
+	rpl::combine(
+		container->geometryValue(),
+		_footerHeight.value()
+	) | rpl::start_with_next([=](QRect geometry, int footer) {
+		if (const auto view = raw->widget()) {
+			view->setGeometry(geometry.marginsRemoved({ 0, 0, 0, footer }));
 		}
 	}, _webview->lifetime);
 
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.h b/Telegram/SourceFiles/payments/ui/payments_panel.h
index b65def0156e53..6c64c661f89c1 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.h
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.h
@@ -115,11 +115,13 @@ class Panel final : public base::has_weak_ptr {
 	[[nodiscard]] bool progressWithBackground() const;
 	[[nodiscard]] QRect progressRect() const;
 	void setupProgressGeometry();
+	void updateFooterHeight();
 
 	const not_null<PanelDelegate*> _delegate;
 	std::unique_ptr<SeparatePanel> _widget;
 	std::unique_ptr<WebviewWithLifetime> _webview;
 	std::unique_ptr<RpWidget> _webviewBottom;
+	rpl::variable<int> _footerHeight;
 	std::unique_ptr<Progress> _progress;
 	QPointer<Checkbox> _saveWebviewInformation;
 	QPointer<FormSummary> _weakFormSummary;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 747c812e440b6..d419d77754c77 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -570,17 +570,15 @@ void Panel::createWebviewBottom() {
 	label->show();
 	_webviewBottom->resize(_webviewBottom->width(), height);
 
-	bottom->heightValue(
-	) | rpl::start_with_next([=](int height) {
-		const auto inner = _widget->innerGeometry();
-		if (_mainButton && !_mainButton->isHidden()) {
-			height = _mainButton->height();
-		}
+	rpl::combine(
+		_webviewParent->geometryValue() | rpl::map([=] {
+			return _widget->innerGeometry();
+		}),
+		bottom->heightValue()
+	) | rpl::start_with_next([=](QRect inner, int height) {
 		bottom->move(inner.x(), inner.y() + inner.height() - height);
-		if (const auto container = _webviewParent.data()) {
-			container->setFixedSize(inner.width(), inner.height() - height);
-		}
 		bottom->resizeToWidth(inner.width());
+		updateFooterHeight();
 	}, bottom->lifetime());
 }
 
@@ -636,10 +634,13 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 		});
 	});
 
-	container->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
-		if (raw->widget()) {
-			raw->widget()->setGeometry(geometry);
+	updateFooterHeight();
+	rpl::combine(
+		container->geometryValue(),
+		_footerHeight.value()
+	) | rpl::start_with_next([=](QRect geometry, int footer) {
+		if (const auto view = raw->widget()) {
+			view->setGeometry(geometry.marginsRemoved({ 0, 0, 0, footer }));
 		}
 	}, _webview->lifetime);
 
@@ -1185,22 +1186,25 @@ void Panel::createMainButton() {
 	button->hide();
 
 	rpl::combine(
+		_webviewParent->geometryValue() | rpl::map([=] {
+			return _widget->innerGeometry();
+		}),
 		button->shownValue(),
 		button->heightValue()
-	) | rpl::start_with_next([=](bool shown, int height) {
-		const auto inner = _widget->innerGeometry();
-		if (!shown) {
-			height = _webviewBottom->height();
-		}
+	) | rpl::start_with_next([=](QRect inner, bool shown, int height) {
 		button->move(inner.x(), inner.y() + inner.height() - height);
-		if (const auto raw = _webviewParent.data()) {
-			raw->setFixedSize(inner.width(), inner.height() - height);
-		}
 		button->resizeToWidth(inner.width());
 		_webviewBottom->setVisible(!shown);
+		updateFooterHeight();
 	}, button->lifetime());
 }
 
+void Panel::updateFooterHeight() {
+	_footerHeight = (_mainButton && !_mainButton->isHidden())
+		? _mainButton->height()
+		: _webviewBottom->height();
+}
+
 void Panel::showBox(object_ptr<BoxContent> box) {
 	if (const auto widget = _webview ? _webview->window.widget() : nullptr) {
 		const auto hideNow = !widget->isHidden();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index ee1dae83776e2..fb0231a012d28 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -143,6 +143,7 @@ class Panel final : public base::has_weak_ptr {
 	[[nodiscard]] bool progressWithBackground() const;
 	[[nodiscard]] QRect progressRect() const;
 	void setupProgressGeometry();
+	void updateFooterHeight();
 
 	Webview::StorageId _storageId;
 	const not_null<Delegate*> _delegate;
@@ -153,9 +154,10 @@ class Panel final : public base::has_weak_ptr {
 	std::unique_ptr<WebviewWithLifetime> _webview;
 	std::unique_ptr<RpWidget> _webviewBottom;
 	rpl::variable<QString> _bottomText;
-	QPointer<QWidget> _webviewParent;
+	QPointer<RpWidget> _webviewParent;
 	std::unique_ptr<Button> _mainButton;
 	mutable crl::time _mainButtonLastClick = 0;
+	rpl::variable<int> _footerHeight = 0;
 	std::unique_ptr<Progress> _progress;
 	rpl::event_stream<> _themeUpdateForced;
 	rpl::lifetime _headerColorLifetime;

From 4fddaef1125465ab11c675467eb61fda33d1aac1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 20 May 2024 12:53:58 +0400
Subject: [PATCH 091/400] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index ebaa206b1d2f1..c68aa80f10b29 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit ebaa206b1d2f1f24cff08f3c8a73054ee69274f0
+Subproject commit c68aa80f10b2953f2d32572e9ae1a5c29cfbfe78

From df808df8d30bdc49f9b208b0dca8bde024ff2844 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 12:59:51 +0000
Subject: [PATCH 092/400] Bump actions/upload-artifact from 2 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/linux.yml        | 2 +-
 .github/workflows/mac.yml          | 2 +-
 .github/workflows/mac_packaged.yml | 2 +-
 .github/workflows/snap.yml         | 2 +-
 .github/workflows/win.yml          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index e8d8f59010d98..8eb20a2e55c43 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -116,7 +116,7 @@ jobs:
           cd $REPO_NAME/out/Debug
           sudo mkdir artifact
           sudo mv {Telegram,Updater} artifact/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 8a83d62dd37ea..e5f5e56206c18 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -134,7 +134,7 @@ jobs:
           mkdir artifact
           mv Telegram.app artifact/
           mv Updater artifact/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index 9b40c249e7f2f..bd51bb74a5b40 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -153,7 +153,7 @@ jobs:
           cd $REPO_NAME/build
           mkdir artifact
           mv Telegram.dmg artifact/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index c2ee6773a4240..93ef6ad36fd90 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -75,7 +75,7 @@ jobs:
           mkdir artifact
           mv $artifact_name artifact
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 1200e1de05dd9..ca0c7bf097016 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -183,7 +183,7 @@ jobs:
           mkdir artifact
           move %OUT%\Telegram.exe artifact/
           move %OUT%\Updater.exe artifact/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         name: Upload artifact.
         if: (env.UPLOAD_ARTIFACT == 'true') || (github.ref == 'refs/heads/nightly')
         with:

From 7dbf8ca1f481e081607dcade5ca1f93afa4599d4 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 21 May 2024 11:24:20 +0400
Subject: [PATCH 093/400] Remove unneeded Qt::WA_InputMethodEnabled

The widget already had it
---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 6e5c30b7b36a1..e3ee48b9eec27 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -240,8 +240,6 @@ Widget::Widget(
 	: nullptr)
 , _searchTimer([=] { searchMessages(); })
 , _singleMessageSearch(&controller->session()) {
-	setAttribute(Qt::WA_InputMethodEnabled);
-
 	const auto makeChildListShown = [](PeerId peerId, float64 shown) {
 		return InnerWidget::ChildListShown{ peerId, shown };
 	};

From 8a5ad581b8847ca7beb1c664b115901ae448e35b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 21 May 2024 14:18:00 +0400
Subject: [PATCH 094/400] Update Qt to 6.7.1 on Linux

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 1f623e190d24c..f41aa85a87a4b 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -1,6 +1,6 @@
 {%- set GIT = "https://github.com" -%}
 {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
-{%- set QT = "6.7.0" -%}
+{%- set QT = "6.7.1" -%}
 {%- set QT_TAG = "v" ~ QT -%}
 {%- set CMAKE_VER = "3.27.6" -%}
 {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 931535985f75ca51313923d31d7924560719b3eb \
+	&& git fetch --depth=1 origin 803f1c2630f5eb0d3b00ba3f095b3079c0533156 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7a6fc8ffa0466..d9db537b31a65 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -165,7 +165,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 931535985f75ca51313923d31d7924560719b3eb
+    source-commit: 803f1c2630f5eb0d3b00ba3f095b3079c0533156
     plugin: dump
     override-pull: |
       craftctl default
@@ -360,7 +360,7 @@ parts:
       - mesa-vulkan-drivers
       - xkb-data
     override-pull: |
-      QT=6.7.0
+      QT=6.7.1
 
       git clone -b v${QT} --depth=1 https://github.com/qt/qt5.git .
       git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools

From 198528f79ff5f4f05a707ee448d898aee730ef91 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 21 May 2024 13:23:07 +0400
Subject: [PATCH 095/400] Remove code needed for a removed patch

---
 .../SourceFiles/platform/linux/integration_linux.cpp   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index b2a8cf6113f2b..147a9f03c6622 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -17,7 +17,6 @@ For license and copyright information please follow this link:
 #include "base/random.h"
 
 #include <QtCore/QAbstractEventDispatcher>
-#include <qpa/qwindowsysteminterface.h>
 
 #include <gio/gio.hpp>
 #include <xdpinhibit/xdpinhibit.hpp>
@@ -190,23 +189,24 @@ class LinuxIntegration final : public Integration, public base::has_weak_ptr {
 
 	const gi::ref_ptr<Application> _application;
 	XdpInhibit::InhibitProxy _inhibitProxy;
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 	base::Platform::XDP::SettingWatcher _darkModeWatcher;
+#endif // Qt < 6.5.0
 };
 
 LinuxIntegration::LinuxIntegration()
 : _application(MakeApplication())
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 , _darkModeWatcher(
 	"org.freedesktop.appearance",
 	"color-scheme",
 	[](GLib::Variant value) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-		QWindowSystemInterface::handleThemeChange();
-#else // Qt >= 6.5.0
 		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
 			Core::App().settings().setSystemDarkMode(value.get_uint32() == 1);
 		});
+})
 #endif // Qt < 6.5.0
-}) {
+{
 	LOG(("Icon theme: %1").arg(QIcon::themeName()));
 	LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
 

From 5e3e9ba8240ebbb7ac85410137e30a6e5791d558 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 22 May 2024 03:36:24 +0400
Subject: [PATCH 096/400] Ensure Qt doesn't prevent quit due to ignored widget
 close events

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

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 3daf9178416b0..4110a73a764f8 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -255,7 +255,10 @@ void Sandbox::setupScreenScale() {
 Sandbox::~Sandbox() = default;
 
 bool Sandbox::event(QEvent *e) {
-	if (e->type() == QEvent::Quit && !Quitting()) {
+	if (e->type() == QEvent::Quit) {
+		if (Quitting()) {
+			return QCoreApplication::event(e);
+		}
 		Quit(QuitReason::QtQuitEvent);
 		e->ignore();
 		return false;

From 84ec2a5f7494ffc2516ecc78ef89aba3da199b33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 22 May 2024 21:18:42 +0400
Subject: [PATCH 097/400] Possibly fix wrong requests order.

---
 Telegram/SourceFiles/mtproto/mtp_instance.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
index 76c5cb623e318..ee10958370136 100644
--- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
@@ -1020,11 +1020,24 @@ void Instance::Private::sendRequest(
 	const auto signedDcId = toMainDc ? -realShiftedDcId : realShiftedDcId;
 	registerRequest(requestId, signedDcId);
 
+	request->lastSentTime = crl::now();
+	request->needsLayer = needsLayer;
+
 	if (afterRequestId) {
 		request->after = getRequest(afterRequestId);
+
+		if (request->after) {
+			// Check if this after request is waiting in _dependentRequests.
+			// This happens if it was after some other request and failed
+			// to wait for it, but that other request is still processed.
+			QMutexLocker locker(&_dependentRequestsLock);
+			const auto i = _dependentRequests.find(afterRequestId);
+			if (i != end(_dependentRequests)) {
+				_dependentRequests.emplace(requestId, afterRequestId);
+				return;
+			}
+		}
 	}
-	request->lastSentTime = crl::now();
-	request->needsLayer = needsLayer;
 
 	session->sendPrepared(request, msCanWait);
 }

From 39c1da6642cc3b2b134c9430af300bd4745112e4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 15 May 2024 18:55:39 +0400
Subject: [PATCH 098/400] Attempt to fix jump to unread in some cases.

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

diff --git a/Telegram/SourceFiles/data/data_replies_list.cpp b/Telegram/SourceFiles/data/data_replies_list.cpp
index 5c1700093609b..2a962dc1b6bc1 100644
--- a/Telegram/SourceFiles/data/data_replies_list.cpp
+++ b/Telegram/SourceFiles/data/data_replies_list.cpp
@@ -368,6 +368,16 @@ bool RepliesList::buildFromData(not_null<Viewer*> viewer) {
 			return viewer->around;
 		} else if (const auto item = lookupRoot()) {
 			return computeInboxReadTillFull();
+		} else if (_owningTopic) {
+			// Somehow we don't want always to jump to computed inboxReadTill
+			// (this was in the code before, but I don't remember why).
+			// Maybe in case we "View Thread" from a group we don't really
+			// want to jump to unread inside thread, cause it isn't defined.
+			//
+			// But in case of topics we definitely want to support jumping
+			// to the first unread, even if it is General topic without the
+			// actual root message or it is a broken topic without root.
+			return computeInboxReadTillFull();
 		}
 		return viewer->around;
 	}();

From f10f3c08dedea7f42fe2dbd89bcb241497daf733 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 15 May 2024 18:55:56 +0400
Subject: [PATCH 099/400] Attempt to fix sending messages to broken topics.

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

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 2c20bcec0ba30..cdc57d00def68 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -3543,7 +3543,8 @@ void HistoryItem::createComponentsHelper(HistoryItemCommonFields &&fields) {
 		const auto topicPost = config.reply.externalPeerId
 			? (replyTo.topicRootId
 				&& (replyTo.topicRootId != Data::ForumTopic::kGeneralId))
-			: (LookupReplyIsTopicPost(to)
+			: (topic
+				|| LookupReplyIsTopicPost(to)
 				|| (to && to->Has<HistoryServiceTopicInfo>())
 				|| (forum && forum->creating(config.reply.topMessageId)));
 		config.reply.topicPost = topicPost ? 1 : 0;

From ec6d6a78cf6180bbeeed08fb2bd219b991d6b88b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 13:29:03 +0400
Subject: [PATCH 100/400] Tab toggles search focus, Backspace doesn't focus.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 33 ++++++++++++-------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 +-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index e3ee48b9eec27..a777cddca7907 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -98,6 +98,15 @@ base::options::toggle OptionForumHideChatsList({
 	.description = "Don't keep a narrow column of chats list.",
 });
 
+[[nodiscard]] bool RedirectTextToSearch(const QString &text) {
+	for (const auto &ch : text) {
+		if (ch.unicode() >= 32) {
+			return true;
+		}
+	}
+	return false;
+}
+
 } // namespace
 
 const char kOptionForumHideChatsList[] = "forum-hide-chats-list";
@@ -454,7 +463,6 @@ Widget::Widget(
 		loadMoreBlockedByDate();
 	}, lifetime());
 
-	_search->setFocusPolicy(Qt::StrongFocus);
 	_search->customUpDown(true);
 
 	updateJumpToDateVisibility(true);
@@ -1514,16 +1522,17 @@ void Widget::checkUpdateStatus() {
 	updateControlsGeometry();
 }
 
-void Widget::setInnerFocus() {
+void Widget::setInnerFocus(bool unfocusSearch) {
 	if (_childList) {
 		_childList->setInnerFocus();
 	} else if ((_openedFolder || _openedForum)
 		&& _subsectionTopBar->searchSetFocus()) {
 		return;
-	} else if (!_search->getLastText().isEmpty()
-		|| _searchInChat
-		|| _searchHasFocus
-		|| _searchSuggestionsLocked) {
+	} else if (!unfocusSearch
+		&& (!_search->getLastText().isEmpty()
+			|| _searchInChat
+			|| _searchHasFocus
+			|| _searchSuggestionsLocked)) {
 		_search->setFocus();
 	} else {
 		setFocus();
@@ -2874,7 +2883,7 @@ bool Widget::setSearchInChat(
 	if (_searchInChat || !_search->getLastText().isEmpty()) {
 		_search->setFocus();
 	} else {
-		setFocus();
+		setInnerFocus(true);
 	}
 	updateForceDisplayWide();
 	return true;
@@ -3255,7 +3264,7 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		//} else {
 		//	e->ignore();
 		//}
-	} else if (e->key() == Qt::Key_Backspace
+	} else if ((e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Tab)
 		&& _searchHasFocus
 		&& !_searchInChat) {
 		escape();
@@ -3339,7 +3348,7 @@ bool Widget::redirectKeyToSearch(QKeyEvent *e) const {
 	}
 	const auto character = !(e->modifiers() & ~Qt::ShiftModifier)
 		&& (e->key() != Qt::Key_Shift)
-		&& !e->text().isEmpty();
+		&& RedirectTextToSearch(e->text());
 	if (character) {
 		return true;
 	} else if (e != QKeySequence::Paste) {
@@ -3467,7 +3476,7 @@ bool Widget::cancelSearch() {
 	if (!clearingQuery
 		&& _subsectionTopBar
 		&& _subsectionTopBar->toggleSearch(false, anim::type::normal)) {
-		setFocus();
+		setInnerFocus(true);
 		clearingInChat = true;
 	}
 	const auto clearSearchFocus = !_searchInChat
@@ -3478,7 +3487,7 @@ bool Widget::cancelSearch() {
 	}
 	if (!_suggestions && clearSearchFocus) {
 		// Don't create suggestions in unfocus case.
-		setFocus();
+		setInnerFocus(true);
 	}
 	_lastSearchPeer = nullptr;
 	_lastSearchId = _lastSearchMigratedId = 0;
@@ -3486,7 +3495,7 @@ bool Widget::cancelSearch() {
 	clearSearchField();
 	applySearchUpdate();
 	if (_suggestions && clearSearchFocus) {
-		setFocus();
+		setInnerFocus(true);
 	}
 	return clearingQuery || clearingInChat || clearSearchFocus;
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index aa6dbdf93487a..b183cb36fded2 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -99,7 +99,7 @@ class Widget final : public Window::AbstractSectionWidget {
 		not_null<Data::Forum*> forum,
 		const Window::SectionShow &params);
 	void searchInChat(Key chat);
-	void setInnerFocus();
+	void setInnerFocus(bool unfocusSearch = false);
 	[[nodiscard]] bool searchHasFocus() const;
 
 	void jumpToTop(bool belowPinned = false);

From ba8bb2d50f9c8707fca207429ca39018517f1b88 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 13:35:01 +0400
Subject: [PATCH 101/400] Add .vscode to .gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 678ef32e3b8fc..c2896799ea0b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ Release/
 *.xcodeproj
 ipch/
 .vs/
+.vscode/
 
 /Telegram/log.txt
 /Telegram/data

From 1c6f45d8d3e6cfe01b0c35aa7ba1c5e6b08a58ec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 19 May 2024 12:05:01 +0400
Subject: [PATCH 102/400] Fix drag-n-drop to frequent/recent contacts.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  | 10 ++++
 Telegram/SourceFiles/boxes/peer_list_box.h    |  3 ++
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 23 ++++++---
 .../dialogs/ui/dialogs_suggestions.cpp        | 51 +++++++++++++++++++
 .../dialogs/ui/dialogs_suggestions.h          | 18 +++++++
 .../dialogs/ui/top_peers_strip.cpp            | 30 +++++++++--
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |  5 ++
 7 files changed, 129 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 7aa48aaa38604..dca4a065bae8a 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -2125,6 +2125,16 @@ bool PeerListContent::submitted() {
 	return false;
 }
 
+PeerListRowId PeerListContent::updateFromParentDrag(QPoint globalPosition) {
+	selectByMouse(globalPosition);
+	const auto row = getRow(_selected.index);
+	return row ? row->id() : 0;
+}
+
+void PeerListContent::dragLeft() {
+	clearSelection();
+}
+
 void PeerListContent::visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) {
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 335001e02c86e..4349fd8c60732 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -625,6 +625,9 @@ class PeerListContent : public Ui::RpWidget {
 	void searchQueryChanged(QString query);
 	bool submitted();
 
+	PeerListRowId updateFromParentDrag(QPoint globalPosition);
+	void dragLeft();
+
 	// Interface for the controller.
 	void appendRow(std::unique_ptr<PeerListRow> row);
 	void appendSearchRow(std::unique_ptr<PeerListRow> row);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index a777cddca7907..da180d12029fc 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2543,15 +2543,18 @@ void Widget::dragMoveEvent(QDragMoveEvent *e) {
 		} else {
 			_chooseByDragTimer.callOnce(ChoosePeerByDragTimeout);
 		}
-		if (_inner->updateFromParentDrag(mapToGlobal(e->pos()))) {
-			e->setDropAction(Qt::CopyAction);
-		} else {
-			e->setDropAction(Qt::IgnoreAction);
-		}
+		const auto global = mapToGlobal(e->pos());
+		const auto thread = _suggestions
+			? _suggestions->updateFromParentDrag(global)
+			: _inner->updateFromParentDrag(global);
+		e->setDropAction(thread ? Qt::CopyAction : Qt::IgnoreAction);
 	} else {
 		if (_dragForward) {
 			updateDragInScroll(false);
 		}
+		if (_suggestions) {
+			_suggestions->dragLeft();
+		}
 		_inner->dragLeft();
 		e->setDropAction(Qt::IgnoreAction);
 	}
@@ -2564,6 +2567,9 @@ void Widget::dragLeaveEvent(QDragLeaveEvent *e) {
 	} else {
 		_chooseByDragTimer.cancel();
 	}
+	if (_suggestions) {
+		_suggestions->dragLeft();
+	}
 	_inner->dragLeft();
 	e->accept();
 }
@@ -2582,8 +2588,11 @@ void Widget::updateDragInScroll(bool inScroll) {
 void Widget::dropEvent(QDropEvent *e) {
 	_chooseByDragTimer.cancel();
 	if (_scroll->geometry().contains(e->pos())) {
-		const auto point = mapToGlobal(e->pos());
-		if (const auto thread = _inner->updateFromParentDrag(point)) {
+		const auto globalPosition = mapToGlobal(e->pos());
+		const auto thread = _suggestions
+			? _suggestions->updateFromParentDrag(globalPosition)
+			: _inner->updateFromParentDrag(globalPosition);
+		if (thread) {
 			e->setDropAction(Qt::CopyAction);
 			e->accept();
 			controller()->content()->filesOrForwardDrop(
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 50362e657a8b7..37be201fa979e 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -1121,6 +1121,39 @@ void Suggestions::chooseRow() {
 	}
 }
 
+Data::Thread *Suggestions::updateFromParentDrag(QPoint globalPosition) {
+	return (_tab.current() == Tab::Chats)
+		? updateFromChatsDrag(globalPosition)
+		: updateFromChannelsDrag(globalPosition);
+}
+
+Data::Thread *Suggestions::updateFromChatsDrag(QPoint globalPosition) {
+	if (const auto top = _topPeers->updateFromParentDrag(globalPosition)) {
+		return _controller->session().data().history(PeerId(top));
+	}
+	return fromListId(_recentUpdateFromParentDrag(globalPosition));
+}
+
+Data::Thread *Suggestions::updateFromChannelsDrag(QPoint globalPosition) {
+	if (const auto id = _myChannelsUpdateFromParentDrag(globalPosition)) {
+		return fromListId(id);
+	}
+	return fromListId(_recommendationsUpdateFromParentDrag(globalPosition));
+}
+
+Data::Thread *Suggestions::fromListId(uint64 peerListRowId) {
+	return peerListRowId
+		? _controller->session().data().history(PeerId(peerListRowId)).get()
+		: nullptr;
+}
+
+void Suggestions::dragLeft() {
+	_topPeers->dragLeft();
+	_recentDragLeft();
+	_myChannelsDragLeft();
+	_recommendationsDragLeft();
+}
+
 void Suggestions::show(anim::type animated, Fn<void()> finish) {
 	RpWidget::show();
 
@@ -1304,6 +1337,12 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
 		}
 		return JumpResult::NotApplied;
 	};
+	_recentUpdateFromParentDrag = [=](QPoint globalPosition) {
+		return raw->updateFromParentDrag(globalPosition);
+	};
+	_recentDragLeft = [=] {
+		raw->dragLeft();
+	};
 	raw->scrollToRequests(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
 		const auto add = _topPeersWrap->toggled() ? _topPeers->height() : 0;
@@ -1438,6 +1477,12 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupMyChannels() {
 		}
 		return JumpResult::NotApplied;
 	};
+	_myChannelsUpdateFromParentDrag = [=](QPoint globalPosition) {
+		return raw->updateFromParentDrag(globalPosition);
+	};
+	_myChannelsDragLeft = [=] {
+		raw->dragLeft();
+	};
 	raw->scrollToRequests(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
 		_channelsScroll->scrollToY(request.ymin, request.ymax);
@@ -1499,6 +1544,12 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecommendations() {
 		}
 		return JumpResult::NotApplied;
 	};
+	_recommendationsUpdateFromParentDrag = [=](QPoint globalPosition) {
+		return raw->updateFromParentDrag(globalPosition);
+	};
+	_recommendationsDragLeft = [=] {
+		raw->dragLeft();
+	};
 	raw->scrollToRequests(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
 		const auto add = _myChannels->toggled() ? _myChannels->height() : 0;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index 49b74fa7404fa..947bf2fa9d7d8 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -12,6 +12,10 @@ For license and copyright information please follow this link:
 #include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
 
+namespace Data {
+class Thread;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -46,6 +50,9 @@ class Suggestions final : public Ui::RpWidget {
 	void selectJump(Qt::Key direction, int pageSize = 0);
 	void chooseRow();
 
+	[[nodiscard]] Data::Thread *updateFromParentDrag(QPoint globalPosition);
+	void dragLeft();
+
 	void show(anim::type animated, Fn<void()> finish);
 	void hide(anim::type animated, Fn<void()> finish);
 	[[nodiscard]] float64 shownOpacity() const;
@@ -90,6 +97,11 @@ class Suggestions final : public Ui::RpWidget {
 	void selectJumpChats(Qt::Key direction, int pageSize);
 	void selectJumpChannels(Qt::Key direction, int pageSize);
 
+	[[nodiscard]] Data::Thread *updateFromChatsDrag(QPoint globalPosition);
+	[[nodiscard]] Data::Thread *updateFromChannelsDrag(
+		QPoint globalPosition);
+	[[nodiscard]] Data::Thread *fromListId(uint64 peerListRowId);
+
 	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupRecentPeers(
 		RecentPeersList recentPeers);
 	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupEmptyRecent();
@@ -121,6 +133,8 @@ class Suggestions final : public Ui::RpWidget {
 	rpl::variable<int> _recentCount;
 	Fn<bool()> _recentPeersChoose;
 	Fn<JumpResult(Qt::Key, int)> _recentSelectJump;
+	Fn<uint64(QPoint)> _recentUpdateFromParentDrag;
+	Fn<void()> _recentDragLeft;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _recentPeers;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _emptyRecent;
 
@@ -130,11 +144,15 @@ class Suggestions final : public Ui::RpWidget {
 	rpl::variable<int> _myChannelsCount;
 	Fn<bool()> _myChannelsChoose;
 	Fn<JumpResult(Qt::Key, int)> _myChannelsSelectJump;
+	Fn<uint64(QPoint)> _myChannelsUpdateFromParentDrag;
+	Fn<void()> _myChannelsDragLeft;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _myChannels;
 
 	rpl::variable<int> _recommendationsCount;
 	Fn<bool()> _recommendationsChoose;
 	Fn<JumpResult(Qt::Key, int)> _recommendationsSelectJump;
+	Fn<uint64(QPoint)> _recommendationsUpdateFromParentDrag;
+	Fn<void()> _recommendationsDragLeft;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _recommendations;
 
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _emptyChannels;
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index f793da346ceab..40e758ad2a524 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -248,7 +248,7 @@ void TopPeersStrip::stripWheelEvent(QWheelEvent *e) {
 
 void TopPeersStrip::stripLeaveEvent(QEvent *e) {
 	if (!_selectionByKeyboard) {
-		setSelected(-1);
+		clearSelection();
 	}
 	if (!_dragging) {
 		_lastMousePosition = std::nullopt;
@@ -299,9 +299,7 @@ void TopPeersStrip::stripMouseMoveEvent(QMouseEvent *e) {
 		&& (_lastMousePosition == e->globalPos())) {
 		return;
 	}
-	_lastMousePosition = e->globalPos();
-	_selectionByKeyboard = false;
-	updateSelected();
+	selectByMouse(e->globalPos());
 
 	if (!_dragging && _mouseDownPosition) {
 		if ((*_lastMousePosition - *_mouseDownPosition).manhattanLength()
@@ -315,6 +313,12 @@ void TopPeersStrip::stripMouseMoveEvent(QMouseEvent *e) {
 	checkDragging();
 }
 
+void TopPeersStrip::selectByMouse(QPoint globalPosition) {
+	_lastMousePosition = globalPosition;
+	_selectionByKeyboard = false;
+	updateSelected();
+}
+
 void TopPeersStrip::checkDragging() {
 	if (_dragging && !_expandAnimation.animating()) {
 		const auto sign = (style::RightToLeft() ? -1 : 1);
@@ -551,6 +555,20 @@ bool TopPeersStrip::chooseRow() {
 	return false;
 }
 
+uint64 TopPeersStrip::updateFromParentDrag(QPoint globalPosition) {
+	if (!rect().contains(mapFromGlobal(globalPosition))) {
+		dragLeft();
+		return 0;
+	}
+	selectByMouse(globalPosition);
+
+	return (_selected >= 0) ? _entries[_selected].id : 0;
+}
+
+void TopPeersStrip::dragLeft() {
+	clearSelection();
+}
+
 void TopPeersStrip::apply(const TopPeersList &list) {
 	if (_hiddenLocally) {
 		return;
@@ -908,6 +926,10 @@ void TopPeersStrip::setSelected(int selected) {
 	}
 }
 
+void TopPeersStrip::clearSelection() {
+	setSelected(-1);
+}
+
 void TopPeersStrip::scrollToSelected() {
 	if (_selected < 0) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 9894235c69892..23db15d1f27d8 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -62,6 +62,9 @@ class TopPeersStrip final : public Ui::RpWidget {
 	void deselectByKeyboard();
 	bool chooseRow();
 
+	uint64 updateFromParentDrag(QPoint globalPosition);
+	void dragLeft();
+
 	[[nodiscard]] auto verticalScrollEvents() const
 		-> rpl::producer<not_null<QWheelEvent*>>;
 
@@ -92,6 +95,8 @@ class TopPeersStrip final : public Ui::RpWidget {
 	void subscribeUserpic(Entry &entry);
 	void unsubscribeUserpics(bool all = false);
 	void paintUserpic(Painter &p, int x, int y, int index, bool selected);
+	void clearSelection();
+	void selectByMouse(QPoint globalPosition);
 
 	[[nodiscard]] QRect outer() const;
 	[[nodiscard]] QRect innerRounded() const;

From db486e957c58a2b79f57db7b5a7d388b9b990efa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 19 May 2024 10:18:55 +0400
Subject: [PATCH 103/400] Fix group/channel Appearance button style.

---
 Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp | 5 +++--
 Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h   | 3 ++-
 Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp  | 6 +++++-
 Telegram/SourceFiles/info/info.style                     | 4 ++++
 Telegram/SourceFiles/settings/settings_chat.cpp          | 3 ++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index 09b5d273b8b30..b2e292a3cbeee 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -1428,14 +1428,15 @@ void SetupPeerColorSample(
 void AddPeerColorButton(
 		not_null<Ui::VerticalLayout*> container,
 		std::shared_ptr<ChatHelpers::Show> show,
-		not_null<PeerData*> peer) {
+		not_null<PeerData*> peer,
+		const style::SettingsButton &st) {
 	auto label = peer->isSelf()
 		? tr::lng_settings_theme_name_color()
 		: tr::lng_edit_channel_color();
 	const auto button = AddButtonWithIcon(
 		container,
 		rpl::duplicate(label),
-		st::settingsColorButton,
+		st,
 		{ &st::menuIconChangeColors });
 
 	const auto style = std::make_shared<Ui::ChatStyle>(
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
index 2272123a1397f..394a13aa88410 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
@@ -48,7 +48,8 @@ void EditPeerColorBox(
 void AddPeerColorButton(
 	not_null<Ui::VerticalLayout*> container,
 	std::shared_ptr<ChatHelpers::Show> show,
-	not_null<PeerData*> peer);
+	not_null<PeerData*> peer,
+	const style::SettingsButton &st);
 
 void CheckBoostLevel(
 	std::shared_ptr<ChatHelpers::Show> show,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index f732c794ee2e3..c79ef325d1774 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1016,7 +1016,11 @@ void Controller::fillColorIndexButton() {
 	Expects(_controls.buttonsLayout != nullptr);
 
 	const auto show = _navigation->uiShow();
-	AddPeerColorButton(_controls.buttonsLayout, show, _peer);
+	AddPeerColorButton(
+		_controls.buttonsLayout,
+		_navigation->uiShow(),
+		_peer,
+		st::managePeerColorsButton);
 }
 
 void Controller::fillSignaturesButton() {
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 329a79158ff1d..ab16a1bd1d606 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -665,6 +665,10 @@ manageGroupTopicsButton: SettingsCountButton(manageGroupTopButtonWithText) {
 		}
 	}
 }
+managePeerColorsButton: SettingsButton(infoProfileButton) {
+	padding: margins(60px, 10px, 48px, 8px);
+}
+
 manageGroupNoIconButtonInner: SettingsButton(infoProfileButton) {
 	padding: margins(25px, 11px, 24px, 8px);
 }
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index 2bc52090eb875..9b2222b0e4426 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -1576,7 +1576,8 @@ void SetupThemeSettings(
 	AddPeerColorButton(
 		container,
 		controller->uiShow(),
-		controller->session().user());
+		controller->session().user(),
+		st::settingsColorButton);
 
 	const auto settings = &Core::App().settings();
 	if (settings->systemDarkMode().has_value()) {

From cedd8fc546df3e58cabd08dc867021444695e061 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 19 May 2024 11:44:05 +0400
Subject: [PATCH 104/400] Fix incorrect replace media button show in reply.

---
 Telegram/SourceFiles/history/history_widget.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 5e8da7f99d11b..029da2623aac2 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -8150,12 +8150,14 @@ void HistoryWidget::updateReplyEditTexts(bool force) {
 		}
 	}
 	if (_replyEditMsg) {
-		const auto media = _replyEditMsg->media();
-		_canReplaceMedia = media && media->allowsEditMedia();
+		const auto editMedia = _editMsgId
+			? _replyEditMsg->media()
+			: nullptr;
+		_canReplaceMedia = editMedia && editMedia->allowsEditMedia();
 		_photoEditMedia = (_canReplaceMedia
-			&& media->photo()
-			&& !media->photo()->isNull())
-			? media->photo()->createMediaView()
+			&& editMedia->photo()
+			&& !editMedia->photo()->isNull())
+			? editMedia->photo()->createMediaView()
 			: nullptr;
 		if (_photoEditMedia) {
 			_photoEditMedia->wanted(

From 74db2167f9c9bd64df7fce8951557b52dae9cced Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 19 May 2024 11:57:10 +0400
Subject: [PATCH 105/400] Allow copy custom emoji from panel.

---
 .../SourceFiles/chat_helpers/emoji_list_widget.cpp  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 2157e916827ed..a5b72ca7ba4e4 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -1134,9 +1134,7 @@ void EmojiListWidget::fillRecentMenu(
 		not_null<Ui::PopupMenu*> menu,
 		int section,
 		int index) {
-	if (section != int(Section::Recent)) {
-		return;
-	}
+	const auto recent = (section == int(Section::Recent));
 	const auto addAction = Ui::Menu::CreateAddActionCallback(menu);
 	const auto over = OverEmoji{ section, index };
 	const auto emoji = lookupOverEmoji(&over);
@@ -1157,18 +1155,21 @@ void EmojiListWidget::fillRecentMenu(
 				TextUtilities::SetClipboardText(data);
 			}, &st::menuIconCopy);
 		}
-		if (setId && _features.openStickerSets) {
+		if (recent && setId && _features.openStickerSets) {
 			addAction(
 				tr::lng_emoji_view_pack(tr::now),
 				crl::guard(this, [=] { displaySet(setId); }),
 				&st::menuIconShowAll);
 		}
-	} else if (emoji) {
+	} else if (recent && emoji) {
 		addAction(tr::lng_emoji_copy(tr::now), [=] {
 			const auto text = emoji->text();
 			TextUtilities::SetClipboardText({ text, { text } });
 		}, &st::menuIconCopy);
 	}
+	if (!recent) {
+		return;
+	}
 	auto id = RecentEmojiId{ emoji };
 	if (custom) {
 		id.data = RecentEmojiDocument{
@@ -1194,7 +1195,7 @@ void EmojiListWidget::fillRecentMenu(
 			.confirmed = crl::guard(this, sure),
 			.confirmText = tr::lng_emoji_reset_recent_button(tr::now),
 			.labelStyle = &st().boxLabel,
-			}));
+		}));
 	};
 	addAction({
 		.text = tr::lng_emoji_reset_recent(tr::now),

From c3fab28e1ce539824991d6d37d24d3796901c0fd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 13 May 2024 10:55:52 +0400
Subject: [PATCH 106/400] Improve scroll style for limited reaction selector.

---
 Telegram/SourceFiles/chat_helpers/chat_helpers.style        | 6 ++++++
 .../view/reactions/history_view_reactions_selector.cpp      | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index f8c8ad61b48ff..73dc78f2392b8 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -785,6 +785,12 @@ emojiScroll: ScrollArea(defaultSolidScroll) {
 reactPanelScroll: ScrollArea(emojiScroll) {
 	deltab: 7px;
 }
+reactPanelScrollRounded: ScrollArea(emojiScroll) {
+	width: 8px;
+	deltax: 3px;
+	deltat: 14px;
+	deltab: 14px;
+}
 
 choosePeerGroupIcon: icon {{ "info/edit/create_group", lightButtonFg }};
 choosePeerChannelIcon: icon {{ "info/edit/create_channel", lightButtonFg }};
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index da65f09027930..cce557ffcb39d 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -924,7 +924,9 @@ void Selector::createList() {
 		&_show->session(),
 		_strip ? _reactions.recent : std::vector<Data::Reaction>(),
 		_strip.get());
-	_scroll = Ui::CreateChild<Ui::ScrollArea>(this, st::reactPanelScroll);
+	_scroll = Ui::CreateChild<Ui::ScrollArea>(this, _reactions.customAllowed
+		? st::reactPanelScroll
+		: st::reactPanelScrollRounded);
 	_scroll->hide();
 
 	const auto st = lifetime().make_state<style::EmojiPan>(_st);

From 0551550e6191dff57c050072fc749c4017271be1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 16:44:55 +0400
Subject: [PATCH 107/400] Don't always open last topic in forums.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index da180d12029fc..ae4061717e06d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -581,14 +581,6 @@ void Widget::chosenRow(const ChosenRow &row) {
 				history,
 				ShowAtUnreadMsgId,
 				Window::SectionShow::Way::ClearStack);
-		} else if (!controller()->adaptive().isOneColumn()) {
-			const auto item = history->chatListMessage();
-			if (const auto topic = item ? item->topic() : nullptr) {
-				controller()->showThread(
-					topic,
-					ShowAtUnreadMsgId,
-					Window::SectionShow::Way::ClearStack);
-			}
 		}
 		return;
 	} else if (history) {

From 685c7a865e697687baedccf3f01a30d3dc5a8726 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 22 May 2024 14:22:01 +0400
Subject: [PATCH 108/400] Use 64 iterations (like OpenSSL 3 for 2048 primes).

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index d4e5c298fc50f..e2c62ef0b4581 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit d4e5c298fc50f0b7cdd90e9998e71f6aa8f1c5e9
+Subproject commit e2c62ef0b4581d84e4ff79623a7e5e9ed315bad7

From 4d4cf472c8bde691cbec4a99c7cfb139b9759cb8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 23 May 2024 13:06:38 +0400
Subject: [PATCH 109/400] Fix crash in group emoji set saving.

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

diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 7de254badbebc..b63ae69677bc1 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -509,7 +509,7 @@ TabbedSelector::TabbedSelector(
 			_st.categoriesBg);
 	}, lifetime());
 
-	if (hasEmojiTab()) {
+	if (hasEmojiTab() && _mode == Mode::Full) {
 		session().data().stickers().emojiSetInstalled(
 		) | rpl::start_with_next([=](uint64 setId) {
 			_tabsSlider->setActiveSection(indexByType(SelectorTab::Emoji));

From d91b75b8f8aff77f826381b836f30f0abff3ee7e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 13:35:21 +0400
Subject: [PATCH 110/400] Allow wide chats in empty window.

---
 Telegram/SourceFiles/core/core_settings.cpp   | 84 +++++++++++++++----
 Telegram/SourceFiles/core/core_settings.h     | 16 +++-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  3 +-
 .../main/main_session_settings.cpp            |  4 +-
 Telegram/SourceFiles/mainwidget.cpp           | 63 ++++++++------
 Telegram/SourceFiles/mainwidget.h             |  2 +-
 .../details/storage_settings_scheme.cpp       |  2 +-
 .../window/window_session_controller.cpp      | 21 +++--
 .../window/window_session_controller.h        | 11 +++
 9 files changed, 149 insertions(+), 57 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 939f4d0537c1e..a54f5ef33328d 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -123,7 +123,8 @@ Settings::Settings()
 : _sendSubmitWay(Ui::InputSubmitSettings::Enter)
 , _floatPlayerColumn(Window::Column::Second)
 , _floatPlayerCorner(RectPart::TopRight)
-, _dialogsWidthRatio(DefaultDialogsWidthRatio()) {
+, _dialogsWithChatWidthRatio(DefaultDialogsWidthRatio())
+, _dialogsNoChatWidthRatio(DefaultDialogsWidthRatio()) {
 }
 
 Settings::~Settings() = default;
@@ -218,7 +219,8 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_callCaptureDeviceId.current())
 		+ Serialize::bytearraySize(ivPosition)
 		+ Serialize::stringSize(noWarningExtensions)
-		+ Serialize::stringSize(_customFontFamily);
+		+ Serialize::stringSize(_customFontFamily)
+		+ sizeof(qint32);
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -280,7 +282,7 @@ QByteArray Settings::serialize() const {
 			<< qint32(_floatPlayerCorner)
 			<< qint32(_thirdSectionInfoEnabled ? 1 : 0)
 			<< qint32(std::clamp(
-				qRound(_dialogsWidthRatio.current() * 1000000),
+				qRound(_dialogsWithChatWidthRatio.current() * 1000000),
 				0,
 				1000000))
 			<< qint32(_thirdColumnWidth.current())
@@ -365,7 +367,11 @@ QByteArray Settings::serialize() const {
 			<< _callCaptureDeviceId.current()
 			<< ivPosition
 			<< noWarningExtensions
-			<< _customFontFamily;
+			<< _customFontFamily
+			<< qint32(std::clamp(
+				qRound(_dialogsNoChatWidthRatio.current() * 1000000),
+				0,
+				1000000));
 	}
 
 	Ensures(result.size() == size);
@@ -434,7 +440,8 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 floatPlayerColumn = static_cast<qint32>(Window::Column::Second);
 	qint32 floatPlayerCorner = static_cast<qint32>(RectPart::TopRight);
 	qint32 thirdSectionInfoEnabled = 0;
-	float64 dialogsWidthRatio = _dialogsWidthRatio.current();
+	float64 dialogsWithChatWidthRatio = _dialogsWithChatWidthRatio.current();
+	float64 dialogsNoChatWidthRatio = _dialogsNoChatWidthRatio.current();
 	qint32 thirdColumnWidth = _thirdColumnWidth.current();
 	qint32 thirdSectionExtendedBy = _thirdSectionExtendedBy;
 	qint32 notifyFromAll = _notifyFromAll ? 1 : 0;
@@ -546,18 +553,18 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 			>> mainMenuAccountsShown;
 	}
 	if (!stream.atEnd()) {
-		auto dialogsWidthRatioInt = qint32();
+		auto dialogsWithChatWidthRatioInt = qint32();
 		stream
 			>> tabbedSelectorSectionEnabled
 			>> floatPlayerColumn
 			>> floatPlayerCorner
 			>> thirdSectionInfoEnabled
-			>> dialogsWidthRatioInt
+			>> dialogsWithChatWidthRatioInt
 			>> thirdColumnWidth
 			>> thirdSectionExtendedBy
 			>> notifyFromAll;
-		dialogsWidthRatio = std::clamp(
-			dialogsWidthRatioInt / 1000000.,
+		dialogsWithChatWidthRatio = std::clamp(
+			dialogsWithChatWidthRatioInt / 1000000.,
 			0.,
 			1.);
 	}
@@ -772,6 +779,15 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> customFontFamily;
 	}
+	if (!stream.atEnd()) {
+		auto dialogsNoChatWidthRatioInt = qint32();
+		stream
+			>> dialogsNoChatWidthRatioInt;
+		dialogsNoChatWidthRatio = std::clamp(
+			dialogsNoChatWidthRatioInt / 1000000.,
+			0.,
+			1.);
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -872,7 +888,10 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	case RectPart::BottomRight: _floatPlayerCorner = uncheckedCorner; break;
 	}
 	_thirdSectionInfoEnabled = thirdSectionInfoEnabled;
-	_dialogsWidthRatio = dialogsWidthRatio;
+	_dialogsWithChatWidthRatio = dialogsWithChatWidthRatio;
+	_dialogsNoChatWidthRatio = (dialogsWithChatWidthRatio > 0)
+		? dialogsWithChatWidthRatio
+		: dialogsNoChatWidthRatio;
 	_thirdColumnWidth = thirdColumnWidth;
 	_thirdSectionExtendedBy = thirdSectionExtendedBy;
 	if (_thirdSectionInfoEnabled) {
@@ -1025,16 +1044,46 @@ void Settings::setTabbedReplacedWithInfo(bool enabled) {
 	}
 }
 
-void Settings::setDialogsWidthRatio(float64 ratio) {
-	_dialogsWidthRatio = ratio;
+void Settings::updateDialogsWidthRatio(float64 ratio, bool nochat) {
+	const auto changeWithChat = !nochat
+		|| (dialogsWithChatWidthRatio() > 0)
+		|| _dialogsWidthSetToZeroWithoutChat;
+	const auto changedWithChat = changeWithChat
+		&& (dialogsWithChatWidthRatio() != ratio);
+
+	const auto changeNoChat = nochat
+		|| (dialogsWithChatWidthRatio() != ratio);
+	const auto changedNoChat = changeNoChat
+		&& (dialogsNoChatWidthRatio() != ratio);
+
+	if (changedWithChat) {
+		_dialogsWidthSetToZeroWithoutChat = nochat && !(ratio > 0);
+		_dialogsWithChatWidthRatio = ratio;
+	}
+	if (changedNoChat) {
+		_dialogsNoChatWidthRatio = ratio;
+	}
+}
+
+float64 Settings::dialogsWidthRatio(bool nochat) const {
+	const auto withchat = dialogsWithChatWidthRatio();
+	return (!nochat || withchat > 0) ? withchat : dialogsNoChatWidthRatio();
+}
+
+float64 Settings::dialogsWithChatWidthRatio() const {
+	return _dialogsWithChatWidthRatio.current();
+}
+
+rpl::producer<float64> Settings::dialogsWithChatWidthRatioChanges() const {
+	return _dialogsWithChatWidthRatio.changes();
 }
 
-float64 Settings::dialogsWidthRatio() const {
-	return _dialogsWidthRatio.current();
+float64 Settings::dialogsNoChatWidthRatio() const {
+	return _dialogsNoChatWidthRatio.current();
 }
 
-rpl::producer<float64> Settings::dialogsWidthRatioChanges() const {
-	return _dialogsWidthRatio.changes();
+rpl::producer<float64> Settings::dialogsNoChatWidthRatioChanges() const {
+	return _dialogsNoChatWidthRatio.changes();
 }
 
 void Settings::setThirdColumnWidth(int width) {
@@ -1326,7 +1375,8 @@ void Settings::resetOnLastLogout() {
 	_floatPlayerCorner = RectPart::TopRight; // per-window
 	_thirdSectionInfoEnabled = true; // per-window
 	_thirdSectionExtendedBy = -1; // per-window
-	_dialogsWidthRatio = DefaultDialogsWidthRatio(); // per-window
+	_dialogsWithChatWidthRatio = DefaultDialogsWidthRatio(); // per-window
+	_dialogsNoChatWidthRatio = DefaultDialogsWidthRatio(); // per-window
 	_thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
 	_notifyFromAll = true;
 	_tabbedReplacedWithInfo = false; // per-window
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 9ebd4887ebf0b..2588923c69d9b 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -614,9 +614,15 @@ class Settings final {
 	[[nodiscard]] RectPart floatPlayerCorner() const {
 		return _floatPlayerCorner;
 	}
-	void setDialogsWidthRatio(float64 ratio);
-	[[nodiscard]] float64 dialogsWidthRatio() const;
-	[[nodiscard]] rpl::producer<float64> dialogsWidthRatioChanges() const;
+
+	void updateDialogsWidthRatio(float64 ratio, bool nochat);
+	[[nodiscard]] float64 dialogsWidthRatio(bool nochat) const;
+
+	[[nodiscard]] float64 dialogsWithChatWidthRatio() const;
+	[[nodiscard]] rpl::producer<float64> dialogsWithChatWidthRatioChanges() const;
+	[[nodiscard]] float64 dialogsNoChatWidthRatio() const;
+	[[nodiscard]] rpl::producer<float64> dialogsNoChatWidthRatioChanges() const;
+
 	void setThirdColumnWidth(int width);
 	[[nodiscard]] int thirdColumnWidth() const;
 	[[nodiscard]] rpl::producer<int> thirdColumnWidthChanges() const;
@@ -969,7 +975,8 @@ class Settings final {
 	bool _thirdSectionInfoEnabled = true; // per-window
 	rpl::event_stream<bool> _thirdSectionInfoEnabledValue; // per-window
 	int _thirdSectionExtendedBy = -1; // per-window
-	rpl::variable<float64> _dialogsWidthRatio; // per-window
+	rpl::variable<float64> _dialogsWithChatWidthRatio; // per-window
+	rpl::variable<float64> _dialogsNoChatWidthRatio; // per-window
 	rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
 	bool _notifyFromAll = true;
 	rpl::variable<bool> _nativeWindowFrame = false;
@@ -1015,6 +1022,7 @@ class Settings final {
 	float64 _rememberedSongVolume = kDefaultVolume;
 	bool _rememberedSoundNotifyFromTray = false;
 	bool _rememberedFlashBounceNotifyFromTray = false;
+	bool _dialogsWidthSetToZeroWithoutChat = false;
 
 	QByteArray _photoEditorBrush;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index ae4061717e06d..db8d630ff3841 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2667,8 +2667,9 @@ void Widget::updateForceDisplayWide() {
 void Widget::showForum(
 		not_null<Data::Forum*> forum,
 		const Window::SectionShow &params) {
+	const auto nochat = !controller()->mainSectionShown();
 	if (!params.childColumn
-		|| !Core::App().settings().dialogsWidthRatio()
+		|| !Core::App().settings().dialogsWidthRatio(nochat)
 		|| (_layout != Layout::Main)
 		|| OptionForumHideChatsList.value()) {
 		changeOpenedForum(forum, params.animated);
diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index 7806dea9f13b8..6349f6b6a3086 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -128,7 +128,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	base::flat_set<PeerId> groupEmojiSectionHidden;
 	qint32 appThirdSectionInfoEnabled = 0;
 	qint32 legacySmallDialogsList = 0;
-	float64 appDialogsWidthRatio = app.dialogsWidthRatio();
+	float64 appDialogsWidthRatio = app.dialogsWidthRatio(false);
 	int appThirdColumnWidth = app.thirdColumnWidth();
 	int appThirdSectionExtendedBy = app.thirdSectionExtendedBy();
 	qint32 appSendFilesWay = app.sendFilesWay().serialize();
@@ -535,7 +535,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 		case RectPart::BottomRight: app.setFloatPlayerCorner(uncheckedCorner); break;
 		}
 		app.setThirdSectionInfoEnabled(appThirdSectionInfoEnabled);
-		app.setDialogsWidthRatio(appDialogsWidthRatio);
+		app.updateDialogsWidthRatio(appDialogsWidthRatio, false);
 		app.setThirdColumnWidth(appThirdColumnWidth);
 		app.setThirdSectionExtendedBy(appThirdSectionExtendedBy);
 	}
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index ecd9ad0669709..ee0b44fba97c5 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -303,8 +303,16 @@ MainWidget::MainWidget(
 		});
 	}, lifetime());
 
+	const auto filter = [=](bool mainSectionShown) {
+		return rpl::filter([=] {
+			return (_controller->mainSectionShown() == mainSectionShown);
+		});
+	};
 	rpl::merge(
-		Core::App().settings().dialogsWidthRatioChanges() | rpl::to_empty,
+		Core::App().settings().dialogsWithChatWidthRatioChanges(
+		) | filter(true) | rpl::to_empty,
+		Core::App().settings().dialogsNoChatWidthRatioChanges(
+		) | filter(false) | rpl::to_empty,
 		Core::App().settings().thirdColumnWidthChanges() | rpl::to_empty
 	) | rpl::start_with_next([=] {
 		updateControlsGeometry();
@@ -1408,6 +1416,7 @@ void MainWidget::showHistory(
 	auto onlyDialogs = noPeer && isOneColumn();
 	_mainSection.destroy();
 
+	updateMainSectionShown();
 	updateControlsGeometry();
 
 	if (noPeer) {
@@ -1781,6 +1790,7 @@ void MainWidget::showNewSection(
 		if (const auto entry = _mainSection->activeChat(); entry.key) {
 			_controller->setActiveChatEntry(entry);
 		}
+		updateMainSectionShown();
 
 		// Depends on SessionController::activeChatEntry
 		// for tabbed selector showing in the third column.
@@ -1815,22 +1825,16 @@ void MainWidget::checkMainSectionToLayer() {
 	}
 	Ui::FocusPersister persister(this);
 	if (auto layer = _mainSection->moveContentToLayer(rect())) {
-		dropMainSection(_mainSection);
+		_mainSection.destroy();
+		_controller->showBackFromStack(
+			SectionShow(
+				anim::type::instant,
+				anim::activation::background));
 		_controller->showSpecialLayer(
 			std::move(layer),
 			anim::type::instant);
 	}
-}
-
-void MainWidget::dropMainSection(Window::SectionWidget *widget) {
-	if (_mainSection != widget) {
-		return;
-	}
-	_mainSection.destroy();
-	_controller->showBackFromStack(
-		SectionShow(
-			anim::type::instant,
-			anim::activation::background));
+	updateMainSectionShown();
 }
 
 PeerData *MainWidget::singlePeer() const {
@@ -2236,13 +2240,18 @@ void MainWidget::resizeEvent(QResizeEvent *e) {
 	updateControlsGeometry();
 }
 
+void MainWidget::updateMainSectionShown() {
+	_controller->setMainSectionShown(_mainSection || _history->peer());
+}
+
 void MainWidget::updateControlsGeometry() {
 	if (!width()) {
 		return;
 	}
 	updateWindowAdaptiveLayout();
 	if (_dialogs) {
-		if (Core::App().settings().dialogsWidthRatio() > 0) {
+		const auto nochat = !_controller->mainSectionShown();
+		if (Core::App().settings().dialogsWidthRatio(nochat) > 0) {
 			_a_dialogsWidth.stop();
 		}
 		if (!_a_dialogsWidth.animating()) {
@@ -2444,19 +2453,22 @@ void MainWidget::ensureFirstColumnResizeAreaCreated() {
 		return;
 	}
 	auto moveLeftCallback = [=](int globalLeft) {
-		auto newWidth = globalLeft - mapToGlobal(QPoint(0, 0)).x();
-		auto newRatio = (newWidth < st::columnMinimalWidthLeft / 2)
+		const auto newWidth = globalLeft - mapToGlobal(QPoint(0, 0)).x();
+		const auto newRatio = (newWidth < st::columnMinimalWidthLeft / 2)
 			? 0.
 			: float64(newWidth) / width();
-		Core::App().settings().setDialogsWidthRatio(newRatio);
+		const auto nochat = !_controller->mainSectionShown();
+		Core::App().settings().updateDialogsWidthRatio(newRatio, nochat);
 	};
 	auto moveFinishedCallback = [=] {
 		if (isOneColumn()) {
 			return;
 		}
-		if (Core::App().settings().dialogsWidthRatio() > 0) {
-			Core::App().settings().setDialogsWidthRatio(
-				float64(_dialogsWidth) / width());
+		const auto nochat = !_controller->mainSectionShown();
+		if (Core::App().settings().dialogsWidthRatio(nochat) > 0) {
+			Core::App().settings().updateDialogsWidthRatio(
+				float64(_dialogsWidth) / width(),
+				nochat);
 		}
 		Core::App().saveSettingsDelayed();
 	};
@@ -2491,12 +2503,13 @@ void MainWidget::ensureThirdColumnResizeAreaCreated() {
 }
 
 void MainWidget::updateDialogsWidthAnimated() {
-	if (!_dialogs || Core::App().settings().dialogsWidthRatio() > 0) {
+	const auto nochat = !_controller->mainSectionShown();
+	if (!_dialogs || Core::App().settings().dialogsWidthRatio(nochat) > 0) {
 		return;
 	}
 	auto dialogsWidth = _dialogsWidth;
 	updateWindowAdaptiveLayout();
-	if (!Core::App().settings().dialogsWidthRatio()
+	if (!Core::App().settings().dialogsWidthRatio(nochat)
 		&& (_dialogsWidth != dialogsWidth
 			|| _a_dialogsWidth.animating())) {
 		_dialogs->startWidthAnimation();
@@ -2709,8 +2722,10 @@ void MainWidget::handleHistoryBack() {
 }
 
 void MainWidget::updateWindowAdaptiveLayout() {
+	const auto nochat = !_controller->mainSectionShown();
+
 	auto layout = _controller->computeColumnLayout();
-	auto dialogsWidthRatio = Core::App().settings().dialogsWidthRatio();
+	auto dialogsWidthRatio = Core::App().settings().dialogsWidthRatio(nochat);
 
 	// Check if we are in a single-column layout in a wide enough window
 	// for the normal layout. If so, switch to the normal layout.
@@ -2753,7 +2768,7 @@ void MainWidget::updateWindowAdaptiveLayout() {
 		//}
 	}
 
-	Core::App().settings().setDialogsWidthRatio(dialogsWidthRatio);
+	Core::App().settings().updateDialogsWidthRatio(dialogsWidthRatio, nochat);
 
 	auto useSmallColumnWidth = !isOneColumn()
 		&& !dialogsWidthRatio
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index aab9239ef6e79..0f769a53f3697 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -250,6 +250,7 @@ class MainWidget final
 	void handleAudioUpdate(const Media::Player::TrackState &state);
 	void updateMediaPlaylistPosition(int x);
 	void updateControlsGeometry();
+	void updateMainSectionShown();
 	void updateDialogsWidthAnimated();
 	void updateThirdColumnToCurrentChat(
 		Dialogs::Key key,
@@ -278,7 +279,6 @@ class MainWidget final
 	void showNewSection(
 		std::shared_ptr<Window::SectionMemento> memento,
 		const SectionShow &params);
-	void dropMainSection(Window::SectionWidget *widget);
 
 	Window::SectionSlideParams prepareThirdSectionAnimation(Window::SectionWidget *section);
 
diff --git a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
index da60290b484f3..9baca321c93fc 100644
--- a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
+++ b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
@@ -400,7 +400,7 @@ bool ReadSetting(
 		stream >> v;
 		if (!CheckStreamStatus(stream)) return false;
 
-		Core::App().settings().setDialogsWidthRatio(v / 1000000.);
+		Core::App().settings().updateDialogsWidthRatio(v / 1000000., false);
 		context.legacyRead = true;
 	} break;
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 7726234e7d7a7..4580991e77eed 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1946,7 +1946,10 @@ int SessionController::countDialogsWidthFromRatio(int bodyWidth) const {
 	if (!_isPrimary) {
 		return 0;
 	}
-	auto result = qRound(bodyWidth * Core::App().settings().dialogsWidthRatio());
+	const auto nochat = !mainSectionShown();
+	const auto width = bodyWidth
+		* Core::App().settings().dialogsWidthRatio(nochat);
+	auto result = qRound(width);
 	accumulate_max(result, st::columnMinimalWidthLeft);
 //	accumulate_min(result, st::columnMaximalWidthLeft);
 	return result;
@@ -2035,10 +2038,12 @@ void SessionController::resizeForThirdSection() {
 		if (extendBy != settings.thirdColumnWidth()) {
 			settings.setThirdColumnWidth(extendBy);
 		}
+		const auto nochat = !mainSectionShown();
 		auto newBodyWidth = layout.bodyWidth + extendedBy;
-		auto currentRatio = settings.dialogsWidthRatio();
-		settings.setDialogsWidthRatio(
-			(currentRatio * layout.bodyWidth) / newBodyWidth);
+		auto currentRatio = settings.dialogsWidthRatio(nochat);
+		settings.updateDialogsWidthRatio(
+			(currentRatio * layout.bodyWidth) / newBodyWidth,
+			nochat);
 	}
 	auto savedValue = (extendedBy == extendBy) ? -1 : extendedBy;
 	settings.setThirdSectionExtendedBy(savedValue);
@@ -2054,6 +2059,7 @@ void SessionController::closeThirdSection() {
 	auto newWindowSize = widget()->size();
 	auto layout = computeColumnLayout();
 	if (layout.windowLayout == Adaptive::WindowLayout::ThreeColumn) {
+		const auto nochat = !mainSectionShown();
 		auto noResize = widget()->isFullScreen()
 			|| widget()->isMaximized();
 		auto savedValue = settings.thirdSectionExtendedBy();
@@ -2063,9 +2069,10 @@ void SessionController::closeThirdSection() {
 		auto newBodyWidth = noResize
 			? layout.bodyWidth
 			: (layout.bodyWidth - extendedBy);
-		auto currentRatio = settings.dialogsWidthRatio();
-		settings.setDialogsWidthRatio(
-			(currentRatio * layout.bodyWidth) / newBodyWidth);
+		auto currentRatio = settings.dialogsWidthRatio(nochat);
+		settings.updateDialogsWidthRatio(
+			(currentRatio * layout.bodyWidth) / newBodyWidth,
+			nochat);
 		newWindowSize = QSize(
 			widget()->width() + (newBodyWidth - layout.bodyWidth),
 			widget()->height());
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index cf4033ce45d2c..4ff92675facc3 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -515,6 +515,16 @@ class SessionController : public SessionNavigation {
 		std::optional<bool> show = std::nullopt) const;
 	void finishChatThemeEdit(not_null<PeerData*> peer);
 
+	[[nodiscard]] bool mainSectionShown() const {
+		return _mainSectionShown.current();
+	}
+	[[nodiscard]] rpl::producer<bool> mainSectionShownChanges() const {
+		return _mainSectionShown.changes();
+	}
+	void setMainSectionShown(bool value) {
+		_mainSectionShown = value;
+	}
+
 	[[nodiscard]] bool chatsForceDisplayWide() const {
 		return _chatsForceDisplayWide.current();
 	}
@@ -678,6 +688,7 @@ class SessionController : public SessionNavigation {
 	rpl::variable<Dialogs::Key> _searchInChat;
 	rpl::variable<Dialogs::RowDescriptor> _activeChatEntry;
 	rpl::lifetime _activeHistoryLifetime;
+	rpl::variable<bool> _mainSectionShown = false;
 	rpl::variable<bool> _chatsForceDisplayWide = false;
 	std::deque<Dialogs::RowDescriptor> _chatEntryHistory;
 	int _chatEntryHistoryPosition = -1;

From f03935ad9aded932cf17e7bb6ac07cb30ff9f885 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 13:57:42 +0400
Subject: [PATCH 111/400] Kill hang processes in case of app quitting.

---
 .../SourceFiles/platform/mac/notifications_manager_mac.mm   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index cc747016ccf0a..de288090772fc 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -550,6 +550,12 @@ void showNotification(
 }
 
 Manager::Private::~Private() {
+	if (_waitingDnd) {
+		_dnd.kill();
+	}
+	if (_waitingFocus) {
+		_focus.kill();
+	}
 	if (_clearingThread.joinable()) {
 		putClearTask(ClearFinish());
 		_clearingThread.join();

From e26b8e7ebc9257cd838e48b7bafdc28747b11c92 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 17:45:30 +0400
Subject: [PATCH 112/400] Fix passcode lock glitch with new search.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index db8d630ff3841..4652f8b22ec9c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1169,13 +1169,16 @@ void Widget::updateSuggestions(anim::type animated) {
 		} else {
 			_suggestions = nullptr;
 			_hidingSuggestions.clear();
+			storiesExplicitCollapse();
+			updateStoriesVisibility();
 			_scroll->show();
 		}
 	} else if (suggest && !_suggestions) {
 		if (animated == anim::type::normal) {
 			startWidthAnimation();
-			updateStoriesVisibility();
 		}
+		// Hides stories and passcode lock.
+		updateStoriesVisibility();
 		_suggestions = std::make_unique<Suggestions>(
 			this,
 			controller(),

From 000911546b6486e7dff9561d444f39a0fb641c23 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 14:44:06 +0400
Subject: [PATCH 113/400] Fix usernames drop on `min` user being received.

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

diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 23f12144372fa..892830edeb871 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -690,7 +690,7 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 				result->setAccessHash(accessHash->v);
 			}
 			status = data.vstatus();
-			{
+			if (!minimal) {
 				const auto newUsername = uname;
 				const auto newUsernames = data.vusernames()
 					? Api::Usernames::FromTL(*data.vusernames())

From b67a1bca49973171257476f6f2faad4346eea045 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 15:12:53 +0400
Subject: [PATCH 114/400] Version 5.0.2.

- Toggle chats search focus by Tab key.
- Unfocus empty search by Backspace key.
- Add a spoiler to already sent media when editing.
- Forward by drag-n-drop to frequent contacts / recent searches.
- Allow wide chats list in empty window
with narrow list when a chat is opened.
- Improve custom font support in the input fields.
- Fix input method typing from unfocused search.
- Fix possible media reordering on batch send.
- Fix crash in group emoji set saving.
- Fix possible hang on quit on macOS.
---
 changelog.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 432af58b0d94b..e5eb46a9f1320 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,16 @@
+5.0.2 (24.05.24)
+
+- Toggle chats search focus by Tab key.
+- Unfocus empty search by Backspace key.
+- Add a spoiler to already sent media when editing.
+- Forward by drag-n-drop to frequent contacts / recent searches.
+- Allow wide chats list in empty window with narrow list when a chat is opened.
+- Improve custom font support in the input fields.
+- Fix input method typing from unfocused search.
+- Fix possible media reordering on batch send.
+- Fix crash in group emoji set saving.
+- Fix possible hang on quit on macOS.
+
 5.0.1 (04.05.24)
 
 - Fix several crashes in new interfaces.

From 364f62660c7a1a136a48275d7b63610d9d4ba8cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 15:26:18 +0400
Subject: [PATCH 115/400] Version 5.0.2: Update the version number.

---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 0021dd5de1e77..e22af137ae62d 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.1.0" />
+    Version="5.0.2.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 73e7a40b7de5b..99096c4ee15d5 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,1,0
- PRODUCTVERSION 5,0,1,0
+ FILEVERSION 5,0,2,0
+ PRODUCTVERSION 5,0,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.1.0"
+            VALUE "FileVersion", "5.0.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.1.0"
+            VALUE "ProductVersion", "5.0.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 50804d11627c9..ebdc4e7bf0579 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,1,0
- PRODUCTVERSION 5,0,1,0
+ FILEVERSION 5,0,2,0
+ PRODUCTVERSION 5,0,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.0.1.0"
+            VALUE "FileVersion", "5.0.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.1.0"
+            VALUE "ProductVersion", "5.0.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 5c6a409e87cba..e75931b502dd2 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5000001;
-constexpr auto AppVersionStr = "5.0.1";
+constexpr auto AppVersion = 5000002;
+constexpr auto AppVersionStr = "5.0.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index dbb89ce4f2df9..8975fea05f6bb 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000001
+AppVersion         5000002
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.1
-AppVersionStr      5.0.1
+AppVersionStrSmall 5.0.2
+AppVersionStr      5.0.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.0.1
+AppVersionOriginal 5.0.2

From 36db1105a28f8df7d2ff1457b071e77ed25a8a55 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 16:09:01 +0400
Subject: [PATCH 116/400] Fix build with Xcode.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 2 +-
 Telegram/SourceFiles/mainwidget.cpp             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 4652f8b22ec9c..f74956bd3d550 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2672,7 +2672,7 @@ void Widget::showForum(
 		const Window::SectionShow &params) {
 	const auto nochat = !controller()->mainSectionShown();
 	if (!params.childColumn
-		|| !Core::App().settings().dialogsWidthRatio(nochat)
+		|| (Core::App().settings().dialogsWidthRatio(nochat) == 0.)
 		|| (_layout != Layout::Main)
 		|| OptionForumHideChatsList.value()) {
 		changeOpenedForum(forum, params.animated);
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index ee0b44fba97c5..c9acfef92775b 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -2509,7 +2509,7 @@ void MainWidget::updateDialogsWidthAnimated() {
 	}
 	auto dialogsWidth = _dialogsWidth;
 	updateWindowAdaptiveLayout();
-	if (!Core::App().settings().dialogsWidthRatio(nochat)
+	if (Core::App().settings().dialogsWidthRatio(nochat) == 0.
 		&& (_dialogsWidth != dialogsWidth
 			|| _a_dialogsWidth.animating())) {
 		_dialogs->startWidthAnimation();

From f4864cddc9ab055e7772fa36ba28b495c0027b12 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 09:20:52 +0400
Subject: [PATCH 117/400] Fix possible crash in Settings of crashed web-app.

Fixes #27943.
---
 Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index d419d77754c77..3fbe6e484e349 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -505,7 +505,7 @@ bool Panel::showWebview(
 	_webview->window.navigate(url);
 	_widget->setBackAllowed(allowBack);
 	_widget->setMenuAllowed([=](const Ui::Menu::MenuCallback &callback) {
-		if (_hasSettingsButton) {
+		if (_webview && _webview->window.widget() && _hasSettingsButton) {
 			callback(tr::lng_bot_settings(tr::now), [=] {
 				postEvent("settings_button_pressed");
 			}, &st::menuIconSettings);
@@ -1294,6 +1294,11 @@ void Panel::postEvent(const QString &event) {
 }
 
 void Panel::postEvent(const QString &event, EventData data) {
+	if (!_webview) {
+		LOG(("BotWebView Error: Post event \"%1\" on crashed webview."
+			).arg(event));
+		return;
+	}
 	auto written = v::is<QString>(data)
 		? v::get<QString>(data).toUtf8()
 		: QJsonDocument(

From 31fcca245f35f4a98c79f9bc8eb41241e40d652d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 16:09:21 +0400
Subject: [PATCH 118/400] Version 5.0.2: Fix IME-to-search on macOS.

---
 .../platform/mac/main_window_mac.h            |  7 ++--
 .../platform/mac/main_window_mac.mm           | 35 +++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index 36dc140bda7a1..6c2d15d07254e 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -20,8 +20,6 @@ class MainWindow : public Window::MainWindow {
 public:
 	explicit MainWindow(not_null<Window::Controller*> controller);
 
-	bool psFilterNativeEvent(void *event);
-
 	int getCustomTitleHeight() const {
 		return _customTitleHeight;
 	}
@@ -47,6 +45,11 @@ class MainWindow : public Window::MainWindow {
 private:
 	friend class Private;
 
+	bool nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		qintptr *result) override;
+
 	void hideAndDeactivate();
 	void updateDockCounter();
 
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 055722742bd68..0b2adb9aab44b 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -63,6 +63,26 @@ - (void) screenIsUnlocked:(NSNotification *)aNotification;
 // fullscreen mode, after that we'll hide the window no matter what.
 constexpr auto kHideAfterFullscreenTimeoutMs = 3000;
 
+[[nodiscard]] bool PossiblyTextTypingEvent(NSEvent *e) {
+	if ([e type] != NSEventTypeKeyDown) {
+		return false;
+	}
+	NSEventModifierFlags flags = [e modifierFlags]
+		& NSEventModifierFlagDeviceIndependentFlagsMask;
+	if ((flags & ~NSEventModifierFlagShift) != 0) {
+		return false;
+	}
+	NSString *text = [e characters];
+	const auto length = int([text length]);
+	for (auto i = 0; i != length; ++i) {
+		const auto utf16 = [text characterAtIndex:i];
+		if (utf16 >= 32) {
+			return true;
+		}
+	}
+	return false;
+}
+
 } // namespace
 
 class MainWindow::Private {
@@ -280,6 +300,21 @@ QString strNotificationAboutScreenUnlocked() {
 void MainWindow::updateWindowIcon() {
 }
 
+bool MainWindow::nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		qintptr *result) {
+	if (message && eventType == "NSEvent") {
+		const auto event = static_cast<NSEvent*>(message);
+		if (PossiblyTextTypingEvent(event)) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+				imeCompositionStartReceived();
+			});
+		}
+	}
+	return false;
+}
+
 void MainWindow::hideAndDeactivate() {
 	hide();
 }

From 62c249015d3f39a0ca67c026cdf091b6c4040153 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 26 May 2024 10:50:35 +0400
Subject: [PATCH 119/400] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index c68aa80f10b29..76a03ceef9858 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit c68aa80f10b2953f2d32572e9ae1a5c29cfbfe78
+Subproject commit 76a03ceef98586ba148260f2f542ef67228f6e0e

From 0033ad749f5fe9b2e8d716bf593496696167eb6f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 27 May 2024 07:48:16 +0400
Subject: [PATCH 120/400] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 76a03ceef9858..bd2d2fe2fb86d 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 76a03ceef98586ba148260f2f542ef67228f6e0e
+Subproject commit bd2d2fe2fb86d3c54d8e2151764be340f8c5809e

From daf30dcab876830af7c9a8601004ec4c54405ee5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 13:33:25 +0400
Subject: [PATCH 121/400] Fix jump to last topic in case of unread topic click.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 542d411182cee..cdf2fef0dc706 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1330,8 +1330,7 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 		const auto selectedTopicJump = selected
 			&& selected->lookupIsInTopicJump(
 				local.x(),
-				mouseY - offset - selected->top())
-			&& _controller->adaptive().isOneColumn();
+				mouseY - offset - selected->top());
 		if (_collapsedSelected != collapsedSelected
 			|| _selected != selected
 			|| _selectedTopicJump != selectedTopicJump) {
@@ -1373,8 +1372,7 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 			const auto selectedTopicJump = (filteredSelected >= 0)
 				&& _filterResults[filteredSelected].row->lookupIsInTopicJump(
 					local.x(),
-					mouseY - skip - _filterResults[filteredSelected].top)
-				&& _controller->adaptive().isOneColumn();
+					mouseY - skip - _filterResults[filteredSelected].top);
 			if (_filteredSelected != filteredSelected
 				|| _selectedTopicJump != selectedTopicJump) {
 				updateSelectedRow();

From ad6e34f3a43664a00e3e6829185b5b97e357a6fd Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 27 May 2024 13:59:05 +0400
Subject: [PATCH 122/400] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index bd2d2fe2fb86d..064ff7cafea26 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit bd2d2fe2fb86d3c54d8e2151764be340f8c5809e
+Subproject commit 064ff7cafea2629c3a7162fb954fc597e0eec652

From 7357b40ba17d84725601462b2952fe3c683aac06 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 17:54:03 +0400
Subject: [PATCH 123/400] Fix build with updated lib_ui.

---
 .../view/history_view_context_menu.cpp        | 38 +------------------
 .../history/view/history_view_context_menu.h  |  2 -
 .../settings/business/settings_chat_intro.cpp |  2 +-
 .../business/settings_quick_replies.cpp       |  3 +-
 4 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index bb74d73119cca..dcebb2628ab3f 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1068,7 +1068,7 @@ void EditTagBox(
 		}
 	}, field->lifetime());
 
-	AddLengthLimitLabel(field, kTagNameLimit);
+	Ui::AddLengthLimitLabel(field, kTagNameLimit);
 
 	const auto save = [=] {
 		const auto text = field->getLastText();
@@ -1828,40 +1828,4 @@ bool ItemHasTtl(HistoryItem *item) {
 		: false;
 }
 
-void AddLengthLimitLabel(not_null<Ui::InputField*> field, int limit) {
-	struct State {
-		rpl::variable<int> length;
-	};
-	const auto state = field->lifetime().make_state<State>();
-	state->length = rpl::single(
-		rpl::empty
-	) | rpl::then(field->changes()) | rpl::map([=] {
-		return int(field->getLastText().size());
-	});
-	auto warningText = state->length.value() | rpl::map([=](int count) {
-		const auto threshold = std::min(limit / 2, 9);
-		const auto left = limit - count;
-		return (left < threshold) ? QString::number(left) : QString();
-	});
-	const auto warning = Ui::CreateChild<Ui::FlatLabel>(
-		field.get(),
-		std::move(warningText),
-		st::editTagLimit);
-	state->length.value() | rpl::map(
-		rpl::mappers::_1 > limit
-	) | rpl::start_with_next([=](bool exceeded) {
-		warning->setTextColorOverride(exceeded
-			? st::attentionButtonFg->c
-			: std::optional<QColor>());
-	}, warning->lifetime());
-	rpl::combine(
-		field->sizeValue(),
-		warning->sizeValue()
-	) | rpl::start_with_next([=] {
-		warning->moveToRight(0, 0);
-	}, warning->lifetime());
-	warning->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-}
-
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.h b/Telegram/SourceFiles/history/view/history_view_context_menu.h
index 8582a57fb14ae..8f00f4da80345 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.h
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.h
@@ -123,6 +123,4 @@ void AddEmojiPacksAction(
 
 [[nodiscard]] bool ItemHasTtl(HistoryItem *item);
 
-void AddLengthLimitLabel(not_null<Ui::InputField*> field, int limit);
-
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index b8a7607f62d42..b9fa7c68c239e 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -164,7 +164,7 @@ class ChatIntro final : public BusinessSection<ChatIntro> {
 			current),
 		st::settingsChatIntroFieldMargins);
 	field->setMaxLength(limit);
-	AddLengthLimitLabel(field, limit);
+	Ui::AddLengthLimitLabel(field, limit);
 	return field;
 }
 
diff --git a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
index 57e74cf25db91..941409f98bafd 100644
--- a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
@@ -11,7 +11,6 @@ For license and copyright information please follow this link:
 #include "core/application.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/data_session.h"
-#include "history/view/history_view_context_menu.h" // AddLengthLimitLabel.
 #include "lang/lang_keys.h"
 #include "main/main_account.h"
 #include "main/main_session.h"
@@ -214,7 +213,7 @@ void EditShortcutNameBox(
 	field->selectAll();
 	field->setMaxLength(kShortcutLimit * 2);
 
-	HistoryView::AddLengthLimitLabel(field, kShortcutLimit);
+	Ui::AddLengthLimitLabel(field, kShortcutLimit);
 
 	const auto callback = [=] {
 		const auto name = field->getLastText().trimmed();

From a43143d01cbda44b2a76582b72c1629992b6a213 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 17:53:54 +0400
Subject: [PATCH 124/400] Separate ForceDisable from LastCheckCrashed.

---
 Telegram/SourceFiles/core/application.cpp   | 5 ++---
 Telegram/SourceFiles/core/core_settings.cpp | 5 +----
 Telegram/lib_ui                             | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 5557eb5030cf6..d0470dfc7288f 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -383,7 +383,7 @@ void Application::run() {
 	}
 
 	SetCrashAnnotationsGL();
-	if (!Platform::IsMac() && Ui::GL::LastCrashCheckFailed()) {
+	if (Ui::GL::LastCrashCheckFailed()) {
 		showOpenGLCrashNotification();
 	}
 
@@ -427,14 +427,12 @@ void Application::checkWindowAccount(not_null<Window::Controller*> window) {
 
 void Application::showOpenGLCrashNotification() {
 	const auto enable = [=] {
-		Ui::GL::ForceDisable(false);
 		Ui::GL::CrashCheckFinish();
 		settings().setDisableOpenGL(false);
 		Local::writeSettings();
 		Restart();
 	};
 	const auto keepDisabled = [=](Fn<void()> close) {
-		Ui::GL::ForceDisable(true);
 		Ui::GL::CrashCheckFinish();
 		settings().setDisableOpenGL(true);
 		Local::writeSettings();
@@ -792,6 +790,7 @@ void Application::badMtprotoConfigurationError() {
 }
 
 void Application::startLocalStorage() {
+	Ui::GL::DetectLastCheckCrash();
 	Local::start();
 	_saveSettingsTimer.emplace([=] { saveSettings(); });
 	settings().saveDelayedRequests() | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index a54f5ef33328d..daaff5acf7c07 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -910,10 +910,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_recentEmojiPreload = std::move(recentEmojiPreload);
 	_emojiVariants = std::move(emojiVariants);
 	_disableOpenGL = (disableOpenGL == 1);
-	if (!Platform::IsMac()) {
-		Ui::GL::ForceDisable(_disableOpenGL
-			|| Ui::GL::LastCrashCheckFailed());
-	}
+	Ui::GL::ForceDisable(_disableOpenGL);
 	_groupCallNoiseSuppression = (groupCallNoiseSuppression == 1);
 	const auto uncheckedWorkMode = static_cast<WorkMode>(workMode);
 	switch (uncheckedWorkMode) {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 037ceb272c4dd..b21a93f3ba47d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 037ceb272c4dd2eb456e18b61e374c1fa759d109
+Subproject commit b21a93f3ba47d6233a0feb764be37850ae1edcb2

From f1c1c900bf84e652a4c391c1cfcc6effc16462d1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 22:08:20 +0400
Subject: [PATCH 125/400] Fix newline regression on Linux.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b21a93f3ba47d..b2653606be9db 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b21a93f3ba47d6233a0feb764be37850ae1edcb2
+Subproject commit b2653606be9db432e850ba1a17da00c4e9cf2e17

From f09a939a7c3c12e50910e84378b488c6ee57cda0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 22:24:19 +0400
Subject: [PATCH 126/400] Improve fix for markup.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b2653606be9db..34fcd4981d764 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b2653606be9db432e850ba1a17da00c4e9cf2e17
+Subproject commit 34fcd4981d764f0869793893f37822b9c09393ab

From 7db9abf72558a4a6009213284d2abf1a9f11d7c8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 10:04:57 +0400
Subject: [PATCH 127/400] Fix forum search open by Ctrl+F.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index f74956bd3d550..a08c16119e2e2 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -999,6 +999,7 @@ void Widget::setupShortcuts() {
 	) | rpl::filter([=] {
 		return isActiveWindow()
 			&& Ui::InFocusChain(this)
+			&& !_childList
 			&& !controller()->isLayerShown()
 			&& !controller()->window().locked();
 	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
@@ -2723,6 +2724,7 @@ void Widget::openChildList(
 		*opacity = value;
 		update();
 		_inner->update();
+		_search->setVisible(value < 1.);
 		if (!value && _childListShadow.get() != shadow) {
 			delete shadow;
 		}

From 32cd2120acc6ff55842f9243d7116d7b8dd8f6ee Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 10:54:20 +0400
Subject: [PATCH 128/400] Allow zero width space in the middle of text.

Fixes #6959.
---
 Telegram/SourceFiles/chat_helpers/message_field.cpp | 5 +----
 Telegram/lib_ui                                     | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 648c5c98c2530..557d0c337e48f 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -431,10 +431,7 @@ bool HasSendText(not_null<const Ui::InputField*> field) {
 	const auto &text = field->getTextWithTags().text;
 	for (const auto &ch : text) {
 		const auto code = ch.unicode();
-		if (code != ' '
-			&& code != '\n'
-			&& code != '\r'
-			&& !IsReplacedBySpace(code)) {
+		if (!IsTrimmed(ch) && !IsReplacedBySpace(code)) {
 			return true;
 		}
 	}
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 34fcd4981d764..a48b3d3750ac1 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 34fcd4981d764f0869793893f37822b9c09393ab
+Subproject commit a48b3d3750ac1a1e3b2f4da3494fa5fb23b66106

From b9f63f80f14d826908089618dee05b2d1a00b6b1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 10:59:46 +0400
Subject: [PATCH 129/400] Reply-in-another-chat by Ctrl+Click on Reply.

---
 .../SourceFiles/history/history_inner_widget.cpp   |  2 +-
 .../history/view/history_view_context_menu.cpp     | 14 +++++---------
 .../history/view/history_view_replies_section.cpp  |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index ae28620d55e2a..1b5e78f3ef1c9 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2399,7 +2399,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			const auto quoteOffset = selected.offset;
 			text.replace('&', u"&&"_q);
 			_menu->addAction(text, [=] {
-				if (canSendReply) {
+				if (canSendReply && !base::IsCtrlPressed()) {
 					_widget->replyToMessage({
 						.messageId = itemId,
 						.quote = quote,
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index dcebb2628ab3f..3905783930d29 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -632,15 +632,11 @@ bool AddReplyToMessageAction(
 	text.replace('&', u"&&"_q);
 	const auto itemId = item->fullId();
 	menu->addAction(text, [=] {
-		if (!item) {
-			return;
-		} else {
-			list->replyToMessageRequestNotify({
-				.messageId = itemId,
-				.quote = quote.text,
-				.quoteOffset = quote.offset,
-			});
-		}
+		list->replyToMessageRequestNotify({
+			.messageId = itemId,
+			.quote = quote.text,
+			.quoteOffset = quote.offset,
+		});
 	}, &st::menuIconReply);
 	return true;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 1974cce2b8033..7db2a21414874 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -327,7 +327,7 @@ RepliesWidget::RepliesWidget(
 		const auto canSendReply = _topic
 			? Data::CanSendAnything(_topic)
 			: Data::CanSendAnything(_history->peer);
-		if (_joinGroup || !canSendReply) {
+		if (_joinGroup || !canSendReply || base::IsCtrlPressed()) {
 			Controls::ShowReplyToChatBox(controller->uiShow(), { fullId });
 		} else {
 			replyToMessage(fullId);

From 72471c74d0d21754e6e70bb5f6250e010c682173 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 11:45:21 +0400
Subject: [PATCH 130/400] Limit symbols that allow diacritics after them.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index a48b3d3750ac1..e7c598affe724 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit a48b3d3750ac1a1e3b2f4da3494fa5fb23b66106
+Subproject commit e7c598affe724322577ef46d9a07d1dcac3c617b

From 275327c789f06064fafbd68d63f31a76bbb07b9c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 11:53:51 +0400
Subject: [PATCH 131/400] Version 5.0.3.

- Ctrl+Click on Reply in menu to Reply in another chat.
- Allow Zero-Width-Space character in text rendering.
- Fix creating custom links in the message field.
- Fix jump to the topic with last unread message.
- Fix newline entering via Shift+Enter on Linux.
- Fix forum search open by Ctrl+F.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 9 +++++++++
 6 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index e22af137ae62d..8048841787c68 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.2.0" />
+    Version="5.0.3.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 99096c4ee15d5..dde7505489fe7 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,2,0
- PRODUCTVERSION 5,0,2,0
+ FILEVERSION 5,0,3,0
+ PRODUCTVERSION 5,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.2.0"
+            VALUE "FileVersion", "5.0.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.2.0"
+            VALUE "ProductVersion", "5.0.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index ebdc4e7bf0579..9fce7f364934d 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,2,0
- PRODUCTVERSION 5,0,2,0
+ FILEVERSION 5,0,3,0
+ PRODUCTVERSION 5,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.0.2.0"
+            VALUE "FileVersion", "5.0.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.2.0"
+            VALUE "ProductVersion", "5.0.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index e75931b502dd2..73f9f2837f7dc 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5000002;
-constexpr auto AppVersionStr = "5.0.2";
+constexpr auto AppVersion = 5000003;
+constexpr auto AppVersionStr = "5.0.3";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 8975fea05f6bb..f0887ef68c656 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000002
+AppVersion         5000003
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.2
-AppVersionStr      5.0.2
+AppVersionStrSmall 5.0.3
+AppVersionStr      5.0.3
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.0.2
+AppVersionOriginal 5.0.3
diff --git a/changelog.txt b/changelog.txt
index e5eb46a9f1320..5a24a32e135a7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,12 @@
+5.0.3 (28.05.24)
+
+- Ctrl+Click on Reply in menu to Reply in another chat.
+- Allow Zero-Width-Space character in text rendering.
+- Fix creating custom links in the message field.
+- Fix jump to the topic with last unread message.
+- Fix newline entering via Shift+Enter on Linux.
+- Fix forum search open by Ctrl+F.
+
 5.0.2 (24.05.24)
 
 - Toggle chats search focus by Tab key.

From adc536b81de8901d89ea26c7297e0aba2a396a87 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 15:00:45 +0400
Subject: [PATCH 132/400] Fix Ctrl+Up reply in topics / comments.

---
 .../history/view/history_view_context_menu.cpp      |  3 ++-
 .../history/view/history_view_list_widget.cpp       |  9 ++++++---
 .../history/view/history_view_list_widget.h         | 13 ++++++++++---
 .../history/view/history_view_replies_section.cpp   |  9 +++++----
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 3905783930d29..559a98ccdbab0 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -16,6 +16,7 @@ For license and copyright information please follow this link:
 #include "api/api_transcribes.h"
 #include "api/api_who_reacted.h"
 #include "api/api_toggling_media.h" // Api::ToggleFavedSticker
+#include "base/qt/qt_key_modifiers.h"
 #include "base/unixtime.h"
 #include "history/view/history_view_list_widget.h"
 #include "history/view/history_view_cursor_state.h"
@@ -636,7 +637,7 @@ bool AddReplyToMessageAction(
 			.messageId = itemId,
 			.quote = quote.text,
 			.quoteOffset = quote.offset,
-		});
+		}, base::IsCtrlPressed());
 	}, &st::menuIconReply);
 	return true;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index e849bd9434e54..e311886056dc9 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -3904,12 +3904,15 @@ bool ListWidget::lastMessageEditRequestNotify() const {
 	}
 }
 
-rpl::producer<FullReplyTo> ListWidget::replyToMessageRequested() const {
+auto ListWidget::replyToMessageRequested() const
+-> rpl::producer<ReplyToMessageRequest> {
 	return _requestedToReplyToMessage.events();
 }
 
-void ListWidget::replyToMessageRequestNotify(FullReplyTo id) {
-	_requestedToReplyToMessage.fire(std::move(id));
+void ListWidget::replyToMessageRequestNotify(
+		FullReplyTo to,
+		bool forceAnotherChat) {
+	_requestedToReplyToMessage.fire({ std::move(to), forceAnotherChat });
 }
 
 rpl::producer<FullMsgId> ListWidget::readMessageRequested() const {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index b68e689e9957f..7770341d90712 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -286,11 +286,18 @@ class ListWidget final
 	QPoint tooltipPos() const override;
 	bool tooltipWindowActive() const override;
 
+	struct ReplyToMessageRequest {
+		FullReplyTo to;
+		bool forceAnotherChat = false;
+	};
 	[[nodiscard]] rpl::producer<FullMsgId> editMessageRequested() const;
 	void editMessageRequestNotify(FullMsgId item) const;
 	[[nodiscard]] bool lastMessageEditRequestNotify() const;
-	[[nodiscard]] rpl::producer<FullReplyTo> replyToMessageRequested() const;
-	void replyToMessageRequestNotify(FullReplyTo id);
+	[[nodiscard]] auto replyToMessageRequested() const
+		-> rpl::producer<ReplyToMessageRequest>;
+	void replyToMessageRequestNotify(
+		FullReplyTo to, 
+		bool forceAnotherChat = false);
 	[[nodiscard]] rpl::producer<FullMsgId> readMessageRequested() const;
 	[[nodiscard]] rpl::producer<FullMsgId> showMessageRequested() const;
 	void replyNextMessage(FullMsgId fullId, bool next = true);
@@ -760,7 +767,7 @@ class ListWidget final
 	base::Timer _touchScrollTimer;
 
 	rpl::event_stream<FullMsgId> _requestedToEditMessage;
-	rpl::event_stream<FullReplyTo> _requestedToReplyToMessage;
+	rpl::event_stream<ReplyToMessageRequest> _requestedToReplyToMessage;
 	rpl::event_stream<FullMsgId> _requestedToReadMessage;
 	rpl::event_stream<FullMsgId> _requestedToShowMessage;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 7db2a21414874..02d9c8412d7d7 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -323,14 +323,15 @@ RepliesWidget::RepliesWidget(
 	}, _inner->lifetime());
 
 	_inner->replyToMessageRequested(
-	) | rpl::start_with_next([=](auto fullId) {
+	) | rpl::start_with_next([=](ListWidget::ReplyToMessageRequest request) {
 		const auto canSendReply = _topic
 			? Data::CanSendAnything(_topic)
 			: Data::CanSendAnything(_history->peer);
-		if (_joinGroup || !canSendReply || base::IsCtrlPressed()) {
-			Controls::ShowReplyToChatBox(controller->uiShow(), { fullId });
+		const auto &to = request.to;
+		if (_joinGroup || !canSendReply || request.forceAnotherChat) {
+			Controls::ShowReplyToChatBox(controller->uiShow(), { to });
 		} else {
-			replyToMessage(fullId);
+			replyToMessage(to);
 			_composeControls->focus();
 		}
 	}, _inner->lifetime());

From 88cd886ec814fd465a7c543b7bcfaf669870e7a5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 28 May 2024 17:34:18 +0400
Subject: [PATCH 133/400] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 064ff7cafea26..115530c7aa869 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 064ff7cafea2629c3a7162fb954fc597e0eec652
+Subproject commit 115530c7aa8694f461d04f95d6a3561a18562e7e

From 9e85b1aa23301b4189e924ed0cf1710828380bb2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 14:37:19 +0300
Subject: [PATCH 134/400] Fixed fake ability to hide webpage media with
 spoiler.

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

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
index 940ff7ff24be3..d6c58bb6adcbc 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
@@ -27,7 +27,7 @@ void MediaEditSpoilerManager::showMenu(
 	const auto media = item->media();
 	const auto hasPreview = media && media->hasReplyPreview();
 	const auto preview = hasPreview ? media->replyPreview() : nullptr;
-	if (!preview) {
+	if (!preview || (media && media->webpage())) {
 		return;
 	}
 	const auto spoilered = _spoilerOverride

From 2605e754ff63ea632e586ade7720fdb42766cd87 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 15:03:20 +0300
Subject: [PATCH 135/400] Added back button to cloud password step in intro.

---
 Telegram/SourceFiles/intro/intro_password_check.h | 4 ++++
 Telegram/SourceFiles/intro/intro_widget.cpp       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/intro/intro_password_check.h b/Telegram/SourceFiles/intro/intro_password_check.h
index ddd11755128bc..9bfcbad3d82c5 100644
--- a/Telegram/SourceFiles/intro/intro_password_check.h
+++ b/Telegram/SourceFiles/intro/intro_password_check.h
@@ -35,6 +35,10 @@ class PasswordCheckWidget final : public Step {
 	void submit() override;
 	rpl::producer<QString> nextButtonText() const override;
 
+	bool hasBack() const override {
+		return true;
+	}
+
 protected:
 	void resizeEvent(QResizeEvent *e) override;
 
diff --git a/Telegram/SourceFiles/intro/intro_widget.cpp b/Telegram/SourceFiles/intro/intro_widget.cpp
index 13ba4837b7dc2..9592929e9dd92 100644
--- a/Telegram/SourceFiles/intro/intro_widget.cpp
+++ b/Telegram/SourceFiles/intro/intro_widget.cpp
@@ -849,7 +849,7 @@ void Widget::backRequested() {
 		Core::App().domain().activate(parent);
 	} else {
 		moveToStep(
-			new StartWidget(this, _account, getData()),
+			Ui::CreateChild<StartWidget>(this, _account, getData()),
 			StackAction::Replace,
 			Animate::Back);
 	}

From 26ba7e57ce79480c095219d069c4db072ef60679 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 15:27:43 +0300
Subject: [PATCH 136/400] Fixed color of radial animation in audio files from
 shared media.

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

diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index c56582bc4219e..d8c70f1df7ef6 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -1398,7 +1398,9 @@ void Document::drawCornerDownload(QPainter &p, bool selected, const PaintContext
 	icon->paintInCenter(p, inner);
 	if (_radial && _radial->animating()) {
 		const auto rinner = inner.marginsRemoved(QMargins(st::historyAudioRadialLine, st::historyAudioRadialLine, st::historyAudioRadialLine, st::historyAudioRadialLine));
-		auto fg = selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg;
+		const auto &fg = selected
+			? st::historyFileInIconFgSelected
+			: st::historyFileInIconFg;
 		_radial->draw(p, rinner, st::historyAudioRadialLine, fg);
 	}
 }

From 48e3802565755be6ad2b1903823525f11590a933 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 16:42:26 +0300
Subject: [PATCH 137/400] Improved labels for channel and group types with
 restricted content.

---
 Telegram/Resources/langs/lang.strings         |  2 ++
 .../boxes/peers/edit_peer_info_box.cpp        | 25 ++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d0a709c6de4da..8484966506c96 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1522,8 +1522,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_peer_link_invite" = "Invite link";
 "lng_manage_peer_link_expired" = "Expired link";
 "lng_manage_private_group_title" = "Private";
+"lng_manage_private_group_noforwards_title" = "Private restricted";
 "lng_manage_public_group_title" = "Public";
 "lng_manage_private_peer_title" = "Private";
+"lng_manage_private_peer_noforwards_title" = "Private restricted";
 "lng_manage_public_peer_title" = "Public";
 "lng_manage_peer_send_title" = "Who can send new messages?";
 "lng_manage_peer_send_only_members" = "Only members";
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index c79ef325d1774..99427aca0ac4b 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -415,7 +415,12 @@ class Controller : public base::has_weak_ptr {
 	std::deque<FnMut<void()>> _saveStagesQueue;
 	Saving _savingData;
 
-	const rpl::event_stream<Privacy> _privacyTypeUpdates;
+	struct PrivacyAndForwards {
+		Privacy privacy;
+		bool noForwards = false;
+	};
+
+	const rpl::event_stream<PrivacyAndForwards> _privacyTypeUpdates;
 	const rpl::event_stream<ChannelData*> _linkedChatUpdates;
 	mtpRequestId _linkedChatsRequestId = 0;
 
@@ -761,7 +766,7 @@ void Controller::refreshHistoryVisibility() {
 void Controller::showEditPeerTypeBox(
 		std::optional<rpl::producer<QString>> error) {
 	const auto boxCallback = crl::guard(this, [=](EditPeerTypeData data) {
-		_privacyTypeUpdates.fire_copy(data.privacy);
+		_privacyTypeUpdates.fire({ data.privacy, data.noForwards });
 		_typeDataSavedValue = data;
 		refreshHistoryVisibility();
 	});
@@ -882,7 +887,8 @@ void Controller::fillPrivacyTypeButton() {
 			? tr::lng_manage_peer_group_type
 			: tr::lng_manage_peer_channel_type)(),
 		_privacyTypeUpdates.events(
-		) | rpl::map([=](Privacy flag) {
+		) | rpl::map([=](PrivacyAndForwards data) {
+			const auto flag = data.privacy;
 			if (flag == Privacy::HasUsername) {
 				_peer->session().api().usernames().requestToCache(_peer);
 			}
@@ -894,14 +900,21 @@ void Controller::fillPrivacyTypeButton() {
 					: tr::lng_manage_public_peer_title)()
 				: (hasLocation
 					? tr::lng_manage_peer_link_invite
-					: isGroup
+					: ((!data.noForwards) && isGroup)
 					? tr::lng_manage_private_group_title
-					: tr::lng_manage_private_peer_title)();
+					: ((!data.noForwards) && !isGroup)
+					? tr::lng_manage_private_peer_title
+					: isGroup
+					? tr::lng_manage_private_group_noforwards_title
+					: tr::lng_manage_private_peer_noforwards_title)();
 		}) | rpl::flatten_latest(),
 		[=] { showEditPeerTypeBox(); },
 		{ &st::menuIconCustomize });
 
-	_privacyTypeUpdates.fire_copy(_typeDataSavedValue->privacy);
+	_privacyTypeUpdates.fire_copy({
+		_typeDataSavedValue->privacy,
+		_typeDataSavedValue->noForwards,
+	});
 }
 
 void Controller::fillLinkedChatButton() {

From f6b849e4f76fcfa27cd0ba8ef722a76c1f93a698 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 18:46:04 +0300
Subject: [PATCH 138/400] Added ability to add proxy from clipboard.

---
 Telegram/Resources/langs/lang.strings         |   4 +
 Telegram/SourceFiles/boxes/connection_box.cpp | 143 ++++++++++++++----
 Telegram/SourceFiles/boxes/connection_box.h   |   4 +-
 3 files changed, 123 insertions(+), 28 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 8484966506c96..87df781f8a8ae 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1053,6 +1053,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_proxy_sponsor" = "Proxy sponsor";
 "lng_proxy_sponsor_about" = "This channel is shown by your proxy server.\nTo remove this channel from your chats list,\ndisable the proxy in Telegram Settings.";
 "lng_proxy_sponsor_warning" = "This proxy may display a sponsored channel in your chat list. This doesn't reveal any of your Telegram traffic.";
+"lng_proxy_add_from_clipboard" = "Add proxy from clipboard";
+"lng_proxy_add_from_clipboard_good_toast" = "Proxy was added from clipboard.";
+"lng_proxy_add_from_clipboard_failed_toast" = "This is not a proxy link.";
+"lng_proxy_add_from_clipboard_existing_toast" = "This proxy is already in the list.";
 "lng_badge_psa_default" = "PSA";
 "lng_about_psa_default" = "This message provides you with a public service announcement. To remove it from your chats list, right click it and select **Hide**.";
 "lng_tooltip_psa_default" = "This message provides you with a public service announcement.";
diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
index cf9d91f8cbe56..f50ef4b3a1232 100644
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.cpp
@@ -7,31 +7,35 @@ For license and copyright information please follow this link:
 */
 #include "boxes/connection_box.h"
 
-#include "ui/boxes/confirm_box.h"
-#include "lang/lang_keys.h"
-#include "storage/localstorage.h"
-#include "base/qthelp_url.h"
 #include "base/call_delayed.h"
+#include "base/qthelp_regex.h"
+#include "base/qthelp_url.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "core/core_settings.h"
+#include "core/local_url_handlers.h"
+#include "lang/lang_keys.h"
 #include "main/main_account.h"
 #include "mtproto/facade.h"
-#include "ui/widgets/checkbox.h"
+#include "storage/localstorage.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/radial_animation.h"
+#include "ui/painter.h"
+#include "ui/text/text_options.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/fields/number_input.h"
 #include "ui/widgets/fields/password_input.h"
 #include "ui/widgets/labels.h"
-#include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
-#include "ui/toast/toast.h"
-#include "ui/effects/animations.h"
-#include "ui/effects/radial_animation.h"
-#include "ui/text/text_options.h"
-#include "ui/text/text_utilities.h"
-#include "ui/basic_click_handlers.h"
-#include "ui/painter.h"
 #include "boxes/abstract_box.h" // Ui::show().
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
@@ -48,6 +52,22 @@ constexpr auto kSaveSettingsDelayedTimeout = crl::time(1000);
 
 using ProxyData = MTP::ProxyData;
 
+[[nodiscard]] ProxyData ProxyDataFromFields(
+		ProxyData::Type type,
+		const QMap<QString, QString> &fields) {
+	auto proxy = ProxyData();
+	proxy.type = type;
+	proxy.host = fields.value(u"server"_q);
+	proxy.port = fields.value(u"port"_q).toUInt();
+	if (type == ProxyData::Type::Socks5) {
+		proxy.user = fields.value(u"user"_q);
+		proxy.password = fields.value(u"pass"_q);
+	} else if (type == ProxyData::Type::Mtproto) {
+		proxy.password = fields.value(u"secret"_q);
+	}
+	return proxy;
+};
+
 class HostInput : public Ui::MaskedInputField {
 public:
 	HostInput(
@@ -203,6 +223,7 @@ class ProxiesBox : public Ui::BoxContent {
 
 private:
 	void setupContent();
+	void setupTopButton();
 	void createNoRowsLabel();
 	void addNewProxy();
 	void applyView(View &&view);
@@ -600,9 +621,80 @@ void ProxiesBox::prepare() {
 	addButton(tr::lng_proxy_add(), [=] { addNewProxy(); });
 	addButton(tr::lng_close(), [=] { closeBox(); });
 
+	setupTopButton();
 	setupContent();
 }
 
+void ProxiesBox::setupTopButton() {
+	const auto top = addTopButton(st::infoTopBarMenu);
+	const auto menu
+		= top->lifetime().make_state<base::unique_qptr<Ui::PopupMenu>>();
+	const auto callback = [=] {
+		const auto maybeUrl = QGuiApplication::clipboard()->text();
+		const auto local = Core::TryConvertUrlToLocal(maybeUrl);
+
+		const auto proxyString = u"proxy"_q;
+		const auto socksString = u"socks"_q;
+		const auto protocol = u"tg://"_q;
+		const auto command = base::StringViewMid(
+			local,
+			protocol.size(),
+			8192);
+
+		if (local.startsWith(protocol + proxyString)
+			|| local.startsWith(protocol + socksString)) {
+
+			using namespace qthelp;
+			const auto options = RegExOption::CaseInsensitive;
+			for (const auto &[expression, _] : Core::LocalUrlHandlers()) {
+				const auto midExpression = base::StringViewMid(
+					expression,
+					1);
+				const auto isSocks = midExpression.startsWith(
+					socksString);
+				if (!midExpression.startsWith(proxyString)
+					&& !isSocks) {
+					continue;
+				}
+				const auto match = regex_match(
+					expression,
+					command,
+					options);
+				if (!match) {
+					continue;
+				}
+				const auto type = isSocks
+					? ProxyData::Type::Socks5
+					: ProxyData::Type::Mtproto;
+				const auto fields = url_parse_params(
+					match->captured(1),
+					qthelp::UrlParamNameTransform::ToLower);
+				const auto proxy = ProxyDataFromFields(type, fields);
+				const auto contains = _controller->contains(proxy);
+				const auto toast = (contains
+					? tr::lng_proxy_add_from_clipboard_existing_toast
+					: tr::lng_proxy_add_from_clipboard_good_toast)(tr::now);
+				uiShow()->showToast(toast);
+				if (!contains) {
+					_controller->addNewItem(proxy);
+				}
+				break;
+			}
+		} else {
+			uiShow()->showToast(
+				tr::lng_proxy_add_from_clipboard_failed_toast(tr::now));
+		}
+	};
+	top->setClickedCallback([=] {
+		*menu = base::make_unique_q<Ui::PopupMenu>(top, st::defaultPopupMenu);
+		(*menu)->addAction(
+			tr::lng_proxy_add_from_clipboard(tr::now),
+			callback);
+		(*menu)->popup(QCursor::pos());
+		return true;
+	});
+}
+
 void ProxiesBox::setupContent() {
 	const auto inner = setInnerWidget(object_ptr<Ui::VerticalLayout>(this));
 
@@ -1096,24 +1188,13 @@ ProxiesBoxController::ProxiesBoxController(not_null<Main::Account*> account)
 void ProxiesBoxController::ShowApplyConfirmation(
 		Type type,
 		const QMap<QString, QString> &fields) {
-	const auto server = fields.value(u"server"_q);
-	const auto port = fields.value(u"port"_q).toUInt();
-	auto proxy = ProxyData();
-	proxy.type = type;
-	proxy.host = server;
-	proxy.port = port;
-	if (type == Type::Socks5) {
-		proxy.user = fields.value(u"user"_q);
-		proxy.password = fields.value(u"pass"_q);
-	} else if (type == Type::Mtproto) {
-		proxy.password = fields.value(u"secret"_q);
-	}
+	const auto proxy = ProxyDataFromFields(type, fields);
 	if (proxy) {
 		static const auto UrlStartRegExp = QRegularExpression(
 			"^https://",
 			QRegularExpression::CaseInsensitiveOption);
 		static const auto UrlEndRegExp = QRegularExpression("/$");
-		const auto displayed = "https://" + server + "/";
+		const auto displayed = "https://" + proxy.host + "/";
 		const auto parsed = QUrl::fromUserInput(displayed);
 		const auto displayUrl = !UrlClickHandler::IsSuspicious(displayed)
 			? displayed
@@ -1131,7 +1212,7 @@ void ProxiesBoxController::ShowApplyConfirmation(
 			lt_server,
 			displayServer,
 			lt_port,
-			QString::number(port))
+			QString::number(proxy.port))
 			+ (proxy.type == Type::Mtproto
 				? "\n\n" + tr::lng_proxy_sponsor_warning(tr::now)
 				: QString());
@@ -1448,6 +1529,14 @@ object_ptr<Ui::BoxContent> ProxiesBoxController::addNewItemBox() {
 	});
 }
 
+bool ProxiesBoxController::contains(const ProxyData &proxy) const {
+	const auto j = ranges::find(
+		_list,
+		proxy,
+		[](const Item &item) { return item.data; });
+	return (j != end(_list));
+}
+
 void ProxiesBoxController::addNewItem(const ProxyData &proxy) {
 	auto &proxies = _settings.list();
 	proxies.push_back(proxy);
diff --git a/Telegram/SourceFiles/boxes/connection_box.h b/Telegram/SourceFiles/boxes/connection_box.h
index 8c78ebf34e109..e3bbfd0067d08 100644
--- a/Telegram/SourceFiles/boxes/connection_box.h
+++ b/Telegram/SourceFiles/boxes/connection_box.h
@@ -77,6 +77,9 @@ class ProxiesBoxController {
 	void setTryIPv6(bool enabled);
 	rpl::producer<ProxyData::Settings> proxySettingsValue() const;
 
+	[[nodiscard]] bool contains(const ProxyData &proxy) const;
+	void addNewItem(const ProxyData &proxy);
+
 	rpl::producer<ItemView> views() const;
 
 	~ProxiesBoxController();
@@ -109,7 +112,6 @@ class ProxiesBoxController {
 	void replaceItemValue(
 		std::vector<Item>::iterator which,
 		const ProxyData &proxy);
-	void addNewItem(const ProxyData &proxy);
 
 	const not_null<Main::Account*> _account;
 	Core::SettingsProxy &_settings;

From 3b6870396c915ab4af3c6f92b8d3cfd59fa54653 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 19:06:48 +0300
Subject: [PATCH 139/400] Added ability to hide every sponsored message to
 premium users.

---
 Telegram/SourceFiles/history/history_inner_widget.cpp |  8 +++++++-
 Telegram/SourceFiles/history/history_item_helpers.cpp | 10 +++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 1b5e78f3ef1c9..9809f9c89e1df 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -161,7 +161,13 @@ void FillSponsoredMessagesMenu(
 		menu->addSeparator(&st::expandedMenuSeparator);
 	}
 	menu->addAction(tr::lng_sponsored_hide_ads(tr::now), [=] {
-		ShowPremiumPreviewBox(controller, PremiumFeature::NoAds);
+		if (controller->session().premium()) {
+			using Result = Data::SponsoredReportResult;
+			controller->session().sponsoredMessages().createReportCallback(
+				itemId)(Result::Id("-1"), [](const auto &) {});
+		} else {
+			ShowPremiumPreviewBox(controller, PremiumFeature::NoAds);
+		}
 	}, &st::menuIconCancel);
 }
 
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 7b51f751c7f34..d3d9569e6dcde 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "api/api_text_entities.h"
 #include "boxes/premium_preview_box.h"
 #include "calls/calls_instance.h"
+#include "data/components/sponsored_messages.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_channel.h"
@@ -363,7 +364,14 @@ ClickHandlerPtr HideSponsoredClickHandler() {
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
 		if (const auto controller = my.sessionWindow.get()) {
-			ShowPremiumPreviewBox(controller, PremiumFeature::NoAds);
+			const auto &session = controller->session();
+			if (session.premium()) {
+				using Result = Data::SponsoredReportResult;
+				session.sponsoredMessages().createReportCallback(
+					my.itemId)(Result::Id("-1"), [](const auto &) {});
+			} else {
+				ShowPremiumPreviewBox(controller, PremiumFeature::NoAds);
+			}
 		}
 	});
 }

From e5132e3fe88dc5f6504b349d05c006ba15fcb135 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 20:32:48 +0400
Subject: [PATCH 140/400] Version 5.0.4

- Fix reply to last message by Ctrl+Up in topics.
- Some other bug fixes.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 5 +++++
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 8048841787c68..519db7170f228 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.3.0" />
+    Version="5.0.4.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index dde7505489fe7..5bec7f3bc4310 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,3,0
- PRODUCTVERSION 5,0,3,0
+ FILEVERSION 5,0,4,0
+ PRODUCTVERSION 5,0,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.3.0"
+            VALUE "FileVersion", "5.0.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.3.0"
+            VALUE "ProductVersion", "5.0.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 9fce7f364934d..d44287d24f24b 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,3,0
- PRODUCTVERSION 5,0,3,0
+ FILEVERSION 5,0,4,0
+ PRODUCTVERSION 5,0,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.0.3.0"
+            VALUE "FileVersion", "5.0.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.3.0"
+            VALUE "ProductVersion", "5.0.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 73f9f2837f7dc..1d8cecd6e7fbd 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5000003;
-constexpr auto AppVersionStr = "5.0.3";
+constexpr auto AppVersion = 5000004;
+constexpr auto AppVersionStr = "5.0.4";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index f0887ef68c656..68f36345376e6 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000003
+AppVersion         5000004
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.3
-AppVersionStr      5.0.3
+AppVersionStrSmall 5.0.4
+AppVersionStr      5.0.4
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.0.3
+AppVersionOriginal 5.0.4
diff --git a/changelog.txt b/changelog.txt
index 5a24a32e135a7..19f721c8597c4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+5.0.4 (28.05.24)
+
+- Fix reply to last message by Ctrl+Up in topics.
+- Some other bug fixes.
+
 5.0.3 (28.05.24)
 
 - Ctrl+Click on Reply in menu to Reply in another chat.

From ef2aa051978bf7d17d5a15fb3a70cad3c96ccc8d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 19:39:19 +0400
Subject: [PATCH 141/400] Allow HistoryView::ListWidget without
 SessionController.

---
 .../history/view/history_view_list_widget.cpp | 312 ++++++++++++------
 .../history/view/history_view_list_widget.h   |  73 +++-
 .../view/history_view_pinned_section.cpp      |   3 +-
 .../view/history_view_pinned_section.h        |   2 +-
 .../view/history_view_replies_section.cpp     |   3 +-
 .../view/history_view_replies_section.h       |   2 +-
 .../view/history_view_scheduled_section.cpp   |   3 +-
 .../view/history_view_scheduled_section.h     |   2 +-
 .../view/history_view_sublist_section.cpp     |   3 +-
 .../view/history_view_sublist_section.h       |   2 +-
 .../business/settings_shortcut_messages.cpp   |  10 +-
 Telegram/SourceFiles/ui/chat/chat_style.h     |   8 +
 .../window/window_session_controller.cpp      |   2 +-
 .../window/window_session_controller.h        |  10 +-
 14 files changed, 311 insertions(+), 124 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index e311886056dc9..5386063392588 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -90,6 +90,95 @@ constexpr auto kClearUserpicsAfter = 50;
 
 } // namespace
 
+const crl::time ListWidget::kItemRevealDuration = crl::time(150);
+
+WindowListDelegate::WindowListDelegate(
+	not_null<Window::SessionController*> window)
+: _window(window) {
+}
+
+not_null<Window::SessionController*> WindowListDelegate::listWindow() {
+	return _window;
+}
+
+not_null<const Ui::ChatStyle*> WindowListDelegate::listChatStyle() {
+	return _window->chatStyle();
+}
+
+rpl::producer<bool> WindowListDelegate::listChatWideValue() {
+	return _window->adaptive().chatWideValue();
+}
+
+auto WindowListDelegate::listMakeReactionsManager(
+	QWidget *wheelEventsTarget,
+	Fn<void(QRect)> update)
+-> std::unique_ptr<Reactions::Manager> {
+	return std::make_unique<Reactions::Manager>(
+		wheelEventsTarget,
+		std::move(update),
+		_window->cachedReactionIconFactory().createMethod());
+}
+
+void WindowListDelegate::listVisibleAreaUpdated() {
+	_window->floatPlayerAreaUpdated();
+}
+
+std::shared_ptr<Ui::Show> WindowListDelegate::listUiShow() {
+	return _window->uiShow();
+}
+
+void WindowListDelegate::listShowPollResults(
+		not_null<PollData*> poll,
+		FullMsgId context) {
+	_window->showPollResults(poll, context);
+}
+
+void WindowListDelegate::listCancelUploadLayer(not_null<HistoryItem*> item) {
+	_window->cancelUploadLayer(item);
+}
+
+bool WindowListDelegate::listAnimationsPaused() {
+	return _window->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
+}
+
+auto WindowListDelegate::listSendingAnimation()
+-> Ui::MessageSendingAnimationController * {
+	return &_window->sendingAnimation();
+}
+
+Ui::ChatPaintContext WindowListDelegate::listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) {
+	return _window->preparePaintContext(std::move(args));
+}
+
+bool WindowListDelegate::listMarkingContentRead() {
+	return _window->widget()->markingAsRead();
+}
+
+bool WindowListDelegate::listIgnorePaintEvent(QWidget *w, QPaintEvent *e) {
+	return _window->contentOverlapped(w, e);
+}
+
+bool WindowListDelegate::listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) {
+	return Window::ShowReactPremiumError(_window, item, id);
+}
+
+void WindowListDelegate::listWindowSetInnerFocus() {
+	_window->widget()->setInnerFocus();
+}
+
+bool WindowListDelegate::listAllowsDragForward() {
+	return _window->adaptive().isOneColumn();
+}
+
+void WindowListDelegate::listLaunchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> finished) {
+	_window->widget()->launchDrag(std::move(data), std::move(finished));
+}
+
 ListWidget::MouseState::MouseState() : pointState(PointState::Outside) {
 }
 
@@ -104,8 +193,6 @@ ListWidget::MouseState::MouseState(
 , pointState(pointState) {
 }
 
-const crl::time ListWidget::kItemRevealDuration = crl::time(150);
-
 template <ListWidget::EnumItemsDirection direction, typename Method>
 void ListWidget::enumerateItems(Method method) {
 	constexpr auto TopToBottom = (direction == EnumItemsDirection::TopToBottom);
@@ -283,31 +370,29 @@ void ListWidget::enumerateDates(Method method) {
 
 ListWidget::ListWidget(
 	QWidget *parent,
-	not_null<Window::SessionController*> controller,
+	not_null<Main::Session*> session,
 	not_null<ListDelegate*> delegate)
 : RpWidget(parent)
 , _delegate(delegate)
-, _controller(controller)
+, _session(session)
 , _emojiInteractions(std::make_unique<EmojiInteractions>(
-	&controller->session(),
+	session,
 	[=](not_null<const Element*> view) { return itemTop(view); }))
 , _context(_delegate->listContext())
 , _itemAverageHeight(itemMinimalHeight())
 , _pathGradient(
 	MakePathShiftGradient(
-		controller->chatStyle(),
+		_delegate->listChatStyle(),
 		[=] { update(); }))
-, _reactionsManager(
-	std::make_unique<Reactions::Manager>(
-		this,
-		[=](QRect updated) { update(updated); },
-		controller->cachedReactionIconFactory().createMethod()))
+, _reactionsManager(_delegate->listMakeReactionsManager(
+	this,
+	[=](QRect updated) { update(updated); }))
 , _translateTracker(MaybeTranslateTracker(_delegate->listTranslateHistory()))
 , _scrollDateCheck([this] { scrollDateCheck(); })
 , _applyUpdatedScrollState([this] { applyUpdatedScrollState(); })
 , _selectEnabled(_delegate->listAllowsMultiSelect())
 , _highlighter(
-	&session().data(),
+	&_session->data(),
 	[=](const HistoryItem *item) { return viewForItem(item); },
 	[=](const Element *view) { repaintItem(view); })
 , _touchSelectTimer([=] { onTouchSelect(); })
@@ -315,25 +400,25 @@ ListWidget::ListWidget(
 	setAttribute(Qt::WA_AcceptTouchEvents);
 	setMouseTracking(true);
 	_scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); });
-	session().data().viewRepaintRequest(
+	_session->data().viewRepaintRequest(
 	) | rpl::start_with_next([this](auto view) {
 		if (view->delegate() == this) {
 			repaintItem(view);
 		}
 	}, lifetime());
-	session().data().viewResizeRequest(
+	_session->data().viewResizeRequest(
 	) | rpl::start_with_next([this](auto view) {
 		if (view->delegate() == this) {
 			resizeItem(view);
 		}
 	}, lifetime());
-	session().data().itemViewRefreshRequest(
+	_session->data().itemViewRefreshRequest(
 	) | rpl::start_with_next([this](auto item) {
 		if (const auto view = viewForItem(item)) {
 			refreshItem(view);
 		}
 	}, lifetime());
-	session().data().viewLayoutChanged(
+	_session->data().viewLayoutChanged(
 	) | rpl::start_with_next([this](auto view) {
 		if (view->delegate() == this) {
 			if (view->isUnderCursor()) {
@@ -341,37 +426,37 @@ ListWidget::ListWidget(
 			}
 		}
 	}, lifetime());
-	session().data().itemDataChanges(
+	_session->data().itemDataChanges(
 	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
 		if (const auto view = viewForItem(item)) {
 			view->itemDataChanged();
 		}
 	}, lifetime());
 
-	session().downloaderTaskFinished(
+	_session->downloaderTaskFinished(
 	) | rpl::start_with_next([=] {
 		update();
 	}, lifetime());
 
-	session().data().peerDecorationsUpdated(
+	_session->data().peerDecorationsUpdated(
 	) | rpl::start_with_next([=] {
 		update();
 	}, lifetime());
 
-	session().data().itemRemoved(
+	_session->data().itemRemoved(
 	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
 		itemRemoved(item);
 	}, lifetime());
 
 	using MessageUpdateFlag = Data::MessageUpdate::Flag;
-	session().changes().realtimeMessageUpdates(
+	_session->changes().realtimeMessageUpdates(
 		MessageUpdateFlag::NewUnreadReaction
 	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
 		maybeMarkReactionsRead(update.item);
 	}, lifetime());
 
 	if (const auto history = _delegate->listTranslateHistory()) {
-		session().changes().historyUpdates(
+		_session->changes().historyUpdates(
 			history,
 			Data::HistoryUpdate::Flag::TranslatedTo
 		) | rpl::start_with_next([=] {
@@ -379,7 +464,7 @@ ListWidget::ListWidget(
 		}, lifetime());
 	}
 
-	session().data().itemVisibilityQueries(
+	_session->data().itemVisibilityQueries(
 	) | rpl::start_with_next([=](
 			const Data::Session::ItemVisibilityQuery &query) {
 		if (const auto view = viewForItem(query.item)) {
@@ -392,25 +477,27 @@ ListWidget::ListWidget(
 		}
 	}, lifetime());
 
-	_reactionsManager->chosen(
-	) | rpl::start_with_next([=](ChosenReaction reaction) {
-		_reactionsManager->updateButton({});
-		reactionChosen(reaction);
-	}, lifetime());
+	if (_reactionsManager) {
+		_reactionsManager->chosen(
+		) | rpl::start_with_next([=](ChosenReaction reaction) {
+			_reactionsManager->updateButton({});
+			reactionChosen(reaction);
+		}, lifetime());
 
-	Reactions::SetupManagerList(
-		_reactionsManager.get(),
-		_reactionsItem.value());
+		Reactions::SetupManagerList(
+			_reactionsManager.get(),
+			_reactionsItem.value());
 
-	Core::App().settings().cornerReactionValue(
-	) | rpl::start_with_next([=](bool value) {
-		_useCornerReaction = value;
-		if (!value) {
-			_reactionsManager->updateButton({});
-		}
-	}, lifetime());
+		Core::App().settings().cornerReactionValue(
+		) | rpl::start_with_next([=](bool value) {
+			_useCornerReaction = value;
+			if (!value) {
+				_reactionsManager->updateButton({});
+			}
+		}, lifetime());
+	}
 
-	controller->adaptive().chatWideValue(
+	_delegate->listChatWideValue(
 	) | rpl::start_with_next([=](bool wide) {
 		_isChatWide = wide;
 	}, lifetime());
@@ -427,11 +514,11 @@ ListWidget::ListWidget(
 }
 
 Main::Session &ListWidget::session() const {
-	return _controller->session();
+	return *_session;
 }
 
 not_null<Window::SessionController*> ListWidget::controller() const {
-	return _controller;
+	return _delegate->listWindow();
 }
 
 not_null<ListDelegate*> ListWidget::delegate() const {
@@ -1006,7 +1093,7 @@ void ListWidget::visibleTopBottomUpdated(
 	} else {
 		scrollDateHideByTimer();
 	}
-	_controller->floatPlayerAreaUpdated();
+	_delegate->listVisibleAreaUpdated();
 	session().data().itemVisibilitiesUpdated();
 	_applyUpdatedScrollState.call();
 
@@ -1439,7 +1526,7 @@ bool ListWidget::showCopyRestriction(HistoryItem *item) {
 	if (type == CopyRestrictionType::None) {
 		return false;
 	}
-	_controller->showToast((type == CopyRestrictionType::Channel)
+	_delegate->listUiShow()->showToast((type == CopyRestrictionType::Channel)
 		? tr::lng_error_nocopy_channel(tr::now)
 		: tr::lng_error_nocopy_group(tr::now));
 	return true;
@@ -1450,7 +1537,7 @@ bool ListWidget::showCopyMediaRestriction(not_null<HistoryItem*> item) {
 	if (type == CopyRestrictionType::None) {
 		return false;
 	}
-	_controller->showToast((type == CopyRestrictionType::Channel)
+	_delegate->listUiShow()->showToast((type == CopyRestrictionType::Channel)
 		? tr::lng_error_nocopy_channel(tr::now)
 		: tr::lng_error_nocopy_group(tr::now));
 	return true;
@@ -1676,7 +1763,7 @@ void ListWidget::elementStartStickerLoop(not_null<const Element*> view) {
 void ListWidget::elementShowPollResults(
 		not_null<PollData*> poll,
 		FullMsgId context) {
-	_controller->showPollResults(poll, context);
+	_delegate->listShowPollResults(poll, context);
 }
 
 void ListWidget::elementOpenPhoto(
@@ -1694,7 +1781,7 @@ void ListWidget::elementOpenDocument(
 
 void ListWidget::elementCancelUpload(const FullMsgId &context) {
 	if (const auto item = session().data().message(context)) {
-		_controller->cancelUploadLayer(item);
+		_delegate->listCancelUploadLayer(item);
 	}
 }
 
@@ -1706,7 +1793,7 @@ void ListWidget::elementShowTooltip(
 }
 
 bool ListWidget::elementAnimationsPaused() {
-	return _controller->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
+	return _delegate->listAnimationsPaused();
 }
 
 bool ListWidget::elementHideReply(not_null<const Element*> view) {
@@ -1838,8 +1925,8 @@ void ListWidget::startItemRevealAnimations() {
 
 void ListWidget::startMessageSendingAnimation(
 		not_null<HistoryItem*> item) {
-	auto &sendingAnimation = controller()->sendingAnimation();
-	if (!sendingAnimation.checkExpectedType(item)) {
+	const auto sendingAnimation = _delegate->listSendingAnimation();
+	if (!sendingAnimation || !sendingAnimation->checkExpectedType(item)) {
 		return;
 	}
 
@@ -1855,7 +1942,7 @@ void ListWidget::startMessageSendingAnimation(
 		return mapToGlobal(QPoint(0, itemTop(view) - additional));
 	});
 
-	sendingAnimation.startAnimation({
+	sendingAnimation->startAnimation({
 		.globalEndTopLeft = std::move(globalEndTopLeft),
 		.view = [=] { return viewForItem(item); },
 		.paintContext = [=] { return preparePaintContext({}); },
@@ -2010,7 +2097,7 @@ TextSelection ListWidget::itemRenderSelection(
 
 Ui::ChatPaintContext ListWidget::preparePaintContext(
 		const QRect &clip) const {
-	return controller()->preparePaintContext({
+	return _delegate->listPreparePaintContext({
 		.theme = _delegate->listChatTheme(),
 		.clip = clip,
 		.visibleAreaPositionGlobal = mapToGlobal(QPoint(0, _visibleTop)),
@@ -2022,7 +2109,7 @@ Ui::ChatPaintContext ListWidget::preparePaintContext(
 bool ListWidget::markingContentsRead() const {
 	return _showFinished
 		&& !_refreshingViewer
-		&& controller()->widget()->markingAsRead();
+		&& _delegate->listMarkingContentRead();
 }
 
 bool ListWidget::markingMessagesRead() const {
@@ -2053,12 +2140,9 @@ void ListWidget::checkActivation() {
 }
 
 void ListWidget::paintEvent(QPaintEvent *e) {
-	if ((_context != Context::ShortcutMessages)
-		&& _controller->contentOverlapped(this, e)) {
+	if (_delegate->listIgnorePaintEvent(this, e)) {
 		return;
-	}
-
-	if (_translateTracker) {
+	} else if (_translateTracker) {
 		_translateTracker->startBunch();
 	}
 	auto readTill = (HistoryItem*)nullptr;
@@ -2100,20 +2184,25 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 		_delegate->listPaintEmpty(p, context);
 		return;
 	}
-	_reactionsManager->startEffectsCollection();
+	if (_reactionsManager) {
+		_reactionsManager->startEffectsCollection();
+	}
 
-	const auto session = &controller()->session();
+	const auto session = &this->session();
 	auto top = itemTop(from->get());
 	context = context.translated(0, -top);
 	p.translate(0, top);
-	const auto &sendingAnimation = _controller->sendingAnimation();
+	const auto sendingAnimation = _delegate->listSendingAnimation();
 	for (auto i = from; i != to; ++i) {
 		const auto view = *i;
 		const auto item = view->data();
 		const auto height = view->height();
-		if (!sendingAnimation.hasAnimatedMessage(item)) {
-			context.reactionInfo
-				= _reactionsManager->currentReactionPaintInfo();
+		if (!sendingAnimation
+			|| !sendingAnimation->hasAnimatedMessage(item)) {
+			if (_reactionsManager) {
+				context.reactionInfo
+					= _reactionsManager->currentReactionPaintInfo();
+			}
 			context.outbg = view->hasOutLayout();
 			context.selection = itemRenderSelection(view);
 			context.highlight = _highlighter.state(item);
@@ -2125,17 +2214,19 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 		const auto isSponsored = item->isSponsored();
 		const auto isUnread = _delegate->listElementShownUnread(view)
 			&& item->isRegular();
-		const auto withReaction = item->hasUnreadReaction();
+		const auto withReaction = context.reactionInfo
+			&& item->hasUnreadReaction();
 		const auto yShown = [&](int y) {
 			return (_visibleBottom >= y && _visibleTop <= y);
 		};
-		const auto markShown = isSponsored
-			? view->markSponsoredViewed(_visibleBottom - top)
-			: withReaction
-			? yShown(top + context.reactionInfo->position.y())
-			: isUnread
-			? yShown(top + height)
-			: yShown(top + height / 2);
+		const auto markShown = (_context != Context::ChatPreview)
+			&& (isSponsored
+				? view->markSponsoredViewed(_visibleBottom - top)
+				: withReaction
+				? yShown(top + context.reactionInfo->position.y())
+				: isUnread
+				? yShown(top + height)
+				: yShown(top + height / 2));
 		if (markShown) {
 			if (isSponsored) {
 				session->sponsoredMessages().view(item->fullId());
@@ -2157,9 +2248,11 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 		if (item->hasExtendedMediaPreview()) {
 			session->api().views().pollExtendedMedia(item);
 		}
-		_reactionsManager->recordCurrentReactionEffect(
-			item->fullId(),
-			QPoint(0, top));
+		if (_reactionsManager) {
+			_reactionsManager->recordCurrentReactionEffect(
+				item->fullId(),
+				QPoint(0, top));
+		}
 		top += height;
 		context.translate(0, -height);
 		p.translate(0, height);
@@ -2170,7 +2263,9 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 	paintUserpics(p, context, clip);
 	paintDates(p, context, clip);
 
-	_reactionsManager->paint(p, context);
+	if (_reactionsManager) {
+		_reactionsManager->paint(p, context);
+	}
 	_emojiInteractions->paint(p);
 }
 
@@ -2181,7 +2276,7 @@ void ListWidget::paintUserpics(
 	if (_context == Context::ShortcutMessages) {
 		return;
 	}
-	const auto session = &controller()->session();
+	const auto session = &this->session();
 	enumerateUserpics([&](not_null<Element*> view, int userpicTop) {
 		// stop the enumeration if the userpic is below the painted rect
 		if (userpicTop >= clip.top() + clip.height()) {
@@ -2530,7 +2625,7 @@ void ListWidget::toggleFavoriteReaction(not_null<Element*> view) const {
 			Data::LookupPossibleReactions(item).recent,
 			favorite,
 			&Data::Reaction::id)
-		|| Window::ShowReactPremiumError(_controller, item, favorite)) {
+		|| _delegate->listShowReactPremiumError(item, favorite)) {
 		return;
 	} else if (!ranges::contains(item->chosenReactions(), favorite)) {
 		if (const auto top = itemTop(view); top >= 0) {
@@ -2599,6 +2694,7 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	if (link
 		&& !link->property(
 			kSendReactionEmojiProperty).value<Data::ReactionId>().empty()
+		&& _reactionsManager
 		&& _reactionsManager->showContextMenu(
 			this,
 			e,
@@ -2624,13 +2720,13 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			this,
 			overItem,
 			clickedReaction,
-			_controller,
+			controller(),
 			_whoReactedMenuLifetime);
 		e->accept();
 		return;
 	}
 
-	auto request = ContextMenuRequest(_controller);
+	auto request = ContextMenuRequest(controller());
 
 	request.link = link;
 	request.view = _overElement;
@@ -2666,12 +2762,12 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	const auto attached = reactItem
 		? AttachSelectorToMenu(
 			_menu.get(),
-			_controller,
+			controller(),
 			desiredPosition,
 			reactItem,
 			[=](ChosenReaction reaction) { reactionChosen(reaction); },
 			ItemReactionsAbout(reactItem),
-			_controller->cachedReactionIconFactory().createMethod())
+			controller()->cachedReactionIconFactory().createMethod())
 		: AttachSelectorResult::Skipped;
 	if (attached == AttachSelectorResult::Failed) {
 		_menu = nullptr;
@@ -2688,10 +2784,7 @@ void ListWidget::reactionChosen(ChosenReaction reaction) {
 	const auto item = session().data().message(reaction.context);
 	if (!item) {
 		return;
-	} else if (Window::ShowReactPremiumError(
-			_controller,
-			item,
-			reaction.id)) {
+	} else if (_delegate->listShowReactPremiumError(item, reaction.id)) {
 		if (_menu) {
 			_menu->hideMenu();
 		}
@@ -2945,7 +3038,9 @@ void ListWidget::enterEventHook(QEnterEvent *e) {
 }
 
 void ListWidget::leaveEventHook(QEvent *e) {
-	_reactionsManager->updateButton({ .cursorLeft = true });
+	if (_reactionsManager) {
+		_reactionsManager->updateButton({ .cursorLeft = true });
+	}
 	if (const auto view = _overElement) {
 		if (_overState.pointState != PointState::Outside) {
 			repaintItem(view);
@@ -3160,9 +3255,9 @@ void ListWidget::mouseActionStart(
 	const auto pressElement = _overElement;
 
 	_mouseAction = MouseAction::None;
-	_pressWasInactive = Ui::WasInactivePress(_controller->widget());
+	_pressWasInactive = Ui::WasInactivePress(window());
 	if (_pressWasInactive) {
-		Ui::MarkInactivePress(_controller->widget(), false);
+		Ui::MarkInactivePress(window(), false);
 	}
 
 	if (ClickHandler::getPressed()) {
@@ -3334,7 +3429,7 @@ void ListWidget::mouseActionFinish(
 		} else if (_selectedTextItem && !_pressWasInactive) {
 			if (_selectedTextRange.from == _selectedTextRange.to) {
 				clearTextSelection();
-				_controller->widget()->setInnerFocus();
+				_delegate->listWindowSetInnerFocus();
 			}
 		}
 	}
@@ -3362,7 +3457,7 @@ ClickHandlerContext ListWidget::prepareClickHandlerContext(FullMsgId id) {
 				? (ElementDelegate*)weak
 				: nullptr;
 		},
-		.sessionWindow = base::make_weak(_controller),
+		.sessionWindow = base::make_weak(controller()),
 	};
 }
 
@@ -3372,7 +3467,9 @@ void ListWidget::mouseActionUpdate() {
 		std::clamp(mousePosition.x(), 0, width()),
 		std::clamp(mousePosition.y(), _visibleTop, _visibleBottom));
 
-	const auto reactionState = _reactionsManager->buttonTextState(point);
+	const auto reactionState = _reactionsManager
+		? _reactionsManager->buttonTextState(point)
+		: TextState();
 	const auto reactionItem = session().data().message(reactionState.itemId);
 	const auto reactionView = viewForItem(reactionItem);
 	const auto view = reactionView
@@ -3392,12 +3489,14 @@ void ListWidget::mouseActionUpdate() {
 		_overElement = view;
 		repaintItem(_overElement);
 	}
-	_reactionsManager->updateButton(view
-		? reactionButtonParameters(
-			view,
-			itemPoint,
-			reactionState)
-		: Reactions::ButtonParameters());
+	if (_reactionsManager) {
+		_reactionsManager->updateButton(view
+			? reactionButtonParameters(
+				view,
+				itemPoint,
+				reactionState)
+			: Reactions::ButtonParameters());
+	}
 	if (viewChanged && view) {
 		_reactionsItem = item;
 	}
@@ -3624,7 +3723,7 @@ std::unique_ptr<QMimeData> ListWidget::prepareDrag() {
 		if (!urls.isEmpty()) {
 			mimeData->setUrls(urls);
 		}
-		if (uponSelected && !_controller->adaptive().isOneColumn()) {
+		if (uponSelected && !_delegate->listAllowsDragForward()) {
 			const auto canForwardAll = [&] {
 				for (const auto &[itemId, data] : _selected) {
 					if (!data.canForward) {
@@ -3689,8 +3788,10 @@ std::unique_ptr<QMimeData> ListWidget::prepareDrag() {
 void ListWidget::performDrag() {
 	if (auto mimeData = prepareDrag()) {
 		// This call enters event loop and can destroy any QObject.
-		_reactionsManager->updateButton({});
-		_controller->widget()->launchDrag(
+		if (_reactionsManager) {
+			_reactionsManager->updateButton({});
+		}
+		_delegate->listLaunchDrag(
 			std::move(mimeData),
 			crl::guard(this, [=] { mouseActionUpdate(QCursor::pos()); }));
 	}
@@ -3708,7 +3809,10 @@ void ListWidget::repaintItem(const Element *view) {
 	const auto range = view->verticalRepaintRange();
 	update(0, top + range.top, width(), range.height);
 	const auto id = view->data()->fullId();
-	if (const auto area = _reactionsManager->lookupEffectArea(id)) {
+	const auto area = _reactionsManager
+		? _reactionsManager->lookupEffectArea(id)
+		: std::nullopt;
+	if (area) {
 		update(*area);
 	}
 }
@@ -3866,7 +3970,9 @@ void ListWidget::itemRemoved(not_null<const HistoryItem*> item) {
 	viewReplaced(view, nullptr);
 	_views.erase(i);
 
-	_reactionsManager->remove(item->fullId());
+	if (_reactionsManager) {
+		_reactionsManager->remove(item->fullId());
+	}
 	updateItemsGeometry();
 }
 
@@ -3992,7 +4098,7 @@ void ConfirmDeleteSelectedItems(not_null<ListWidget*> widget) {
 		}
 	}
 	auto box = Box<DeleteMessagesBox>(
-		&widget->controller()->session(),
+		&widget->session(),
 		widget->getSelectedIds());
 	box->setDeleteConfirmedCallback(crl::guard(widget, [=] {
 		widget->cancelSelection();
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index 7770341d90712..f885827229e6e 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -25,11 +25,14 @@ class Session;
 } // namespace Main
 
 namespace Ui {
+class Show;
 class PopupMenu;
 class ChatTheme;
 struct ChatPaintContext;
+struct ChatPaintContextArgs;
 enum class TouchScrollState;
 struct PeerUserpicView;
+class MessageSendingAnimationController;
 } // namespace Ui
 
 namespace Window {
@@ -40,6 +43,7 @@ namespace Data {
 struct Group;
 struct Reaction;
 struct AllowedReactions;
+struct ReactionId;
 } // namespace Data
 
 namespace HistoryView::Reactions {
@@ -154,6 +158,71 @@ class ListDelegate {
 	virtual History *listTranslateHistory() = 0;
 	virtual void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) = 0;
+
+	// Methods that use Window::SessionController by default.
+	virtual not_null<Window::SessionController*> listWindow() = 0;
+	virtual not_null<const Ui::ChatStyle*> listChatStyle() = 0;
+	virtual rpl::producer<bool> listChatWideValue() = 0;
+	virtual std::unique_ptr<Reactions::Manager> listMakeReactionsManager(
+		QWidget *wheelEventsTarget,
+		Fn<void(QRect)> update) = 0;
+	virtual void listVisibleAreaUpdated() = 0;
+	virtual std::shared_ptr<Ui::Show> listUiShow() = 0;
+	virtual void listShowPollResults(
+		not_null<PollData*> poll,
+		FullMsgId context) = 0;
+	virtual void listCancelUploadLayer(not_null<HistoryItem*> item) = 0;
+	virtual bool listAnimationsPaused() = 0;
+	virtual auto listSendingAnimation()
+		-> Ui::MessageSendingAnimationController* = 0;
+	virtual Ui::ChatPaintContext listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) = 0;
+	virtual bool listMarkingContentRead() = 0;
+	virtual bool listIgnorePaintEvent(QWidget *w, QPaintEvent *e) = 0;
+	virtual bool listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) = 0;
+	virtual void listWindowSetInnerFocus() = 0;
+	virtual bool listAllowsDragForward() = 0;
+	virtual void listLaunchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> finished) = 0;
+};
+
+class WindowListDelegate : public ListDelegate {
+public:
+	explicit WindowListDelegate(not_null<Window::SessionController*> window);
+
+	not_null<Window::SessionController*> listWindow() override;
+	not_null<const Ui::ChatStyle*> listChatStyle() override;
+	rpl::producer<bool> listChatWideValue() override;
+	std::unique_ptr<Reactions::Manager> listMakeReactionsManager(
+		QWidget *wheelEventsTarget,
+		Fn<void(QRect)> update) override;
+	void listVisibleAreaUpdated() override;
+	std::shared_ptr<Ui::Show> listUiShow() override;
+	void listShowPollResults(
+		not_null<PollData*> poll,
+		FullMsgId context) override;
+	void listCancelUploadLayer(not_null<HistoryItem*> item) override;
+	bool listAnimationsPaused() override;
+	Ui::MessageSendingAnimationController *listSendingAnimation() override;
+	Ui::ChatPaintContext listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) override;
+	bool listMarkingContentRead() override;
+	bool listIgnorePaintEvent(QWidget *w, QPaintEvent *e) override;
+	bool listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) override;
+	void listWindowSetInnerFocus() override;
+	bool listAllowsDragForward() override;
+	void listLaunchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> finished) override;
+
+private:
+	const not_null<Window::SessionController*> _window;
+
 };
 
 struct SelectionData {
@@ -211,7 +280,7 @@ class ListWidget final
 public:
 	ListWidget(
 		QWidget *parent,
-		not_null<Window::SessionController*> controller,
+		not_null<Main::Session*> session,
 		not_null<ListDelegate*> delegate);
 
 	static const crl::time kItemRevealDuration;
@@ -648,7 +717,7 @@ class ListWidget final
 	static constexpr auto kMinimalIdsLimit = 24;
 
 	const not_null<ListDelegate*> _delegate;
-	const not_null<Window::SessionController*> _controller;
+	const not_null<Main::Session*> _session;
 	const std::unique_ptr<EmojiInteractions> _emojiInteractions;
 	const Context _context;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 0051aecea8a73..51a3101ebf0bb 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -94,6 +94,7 @@ PinnedWidget::PinnedWidget(
 	not_null<Window::SessionController*> controller,
 	not_null<Data::Thread*> thread)
 : Window::SectionWidget(parent, controller, thread->peer())
+, WindowListDelegate(controller)
 , _thread(thread->migrateToOrMe())
 , _history(thread->owningHistory())
 , _migratedPeer(thread->asHistory()
@@ -161,7 +162,7 @@ PinnedWidget::PinnedWidget(
 
 	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
-		controller,
+		&controller->session(),
 		static_cast<ListDelegate*>(this)));
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index 88a592a1bf25c..2c54e0684d244 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -36,7 +36,7 @@ class TranslateBar;
 
 class PinnedWidget final
 	: public Window::SectionWidget
-	, private ListDelegate
+	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
 	PinnedWidget(
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 02d9c8412d7d7..b1dcb13dbc356 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -205,6 +205,7 @@ RepliesWidget::RepliesWidget(
 	not_null<History*> history,
 	MsgId rootId)
 : Window::SectionWidget(parent, controller, history->peer)
+, WindowListDelegate(controller)
 , _history(history)
 , _rootId(rootId)
 , _root(lookupRoot())
@@ -299,7 +300,7 @@ RepliesWidget::RepliesWidget(
 
 	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
-		controller,
+		&controller->session(),
 		static_cast<ListDelegate*>(this)));
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 33b7859b48930..e3d05920e5f22 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -71,7 +71,7 @@ class TranslateBar;
 
 class RepliesWidget final
 	: public Window::SectionWidget
-	, private ListDelegate
+	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
 	RepliesWidget(
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 887d16e095431..3fe205b3c328b 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -97,6 +97,7 @@ ScheduledWidget::ScheduledWidget(
 	not_null<History*> history,
 	const Data::ForumTopic *forumTopic)
 : Window::SectionWidget(parent, controller, history->peer)
+, WindowListDelegate(controller)
 , _history(history)
 , _forumTopic(forumTopic)
 , _scroll(
@@ -167,7 +168,7 @@ ScheduledWidget::ScheduledWidget(
 
 	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
-		controller,
+		&controller->session(),
 		static_cast<ListDelegate*>(this)));
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 6685c113a4cb0..9f181d231cbd6 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -52,7 +52,7 @@ class StickerToast;
 
 class ScheduledWidget final
 	: public Window::SectionWidget
-	, private ListDelegate
+	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
 	ScheduledWidget(
diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
index f4116fd1597dd..df4f4ea048c4e 100644
--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
@@ -67,6 +67,7 @@ SublistWidget::SublistWidget(
 	not_null<Window::SessionController*> controller,
 	not_null<Data::SavedSublist*> sublist)
 : Window::SectionWidget(parent, controller, sublist->peer())
+, WindowListDelegate(controller)
 , _sublist(sublist)
 , _history(sublist->owner().history(sublist->session().user()))
 , _topBar(this, controller)
@@ -133,7 +134,7 @@ SublistWidget::SublistWidget(
 
 	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
-		controller,
+		&controller->session(),
 		static_cast<ListDelegate*>(this)));
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.h b/Telegram/SourceFiles/history/view/history_view_sublist_section.h
index 7ce8804396ee9..eff71d50cf1de 100644
--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_sublist_section.h
@@ -37,7 +37,7 @@ class ComposeSearch;
 
 class SublistWidget final
 	: public Window::SectionWidget
-	, private ListDelegate
+	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
 	SublistWidget(
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index ca82da32981e4..22e419efa6c75 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -72,7 +72,7 @@ using namespace HistoryView;
 
 class ShortcutMessages
 	: public AbstractSection
-	, private ListDelegate
+	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
 	ShortcutMessages(
@@ -164,6 +164,7 @@ class ShortcutMessages
 	History *listTranslateHistory() override;
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
+	bool listIgnorePaintEvent(QWidget *w, QPaintEvent *e) override;
 
 	// CornerButtonsDelegate delegate.
 	void cornerButtonsShowAtPosition(
@@ -330,6 +331,7 @@ ShortcutMessages::ShortcutMessages(
 	rpl::producer<Container> containerValue,
 	BusinessShortcutId shortcutId)
 : AbstractSection(parent)
+, WindowListDelegate(controller)
 , _controller(controller)
 , _session(&controller->session())
 , _scroll(scroll)
@@ -370,7 +372,7 @@ ShortcutMessages::ShortcutMessages(
 
 	_inner = Ui::CreateChild<ListWidget>(
 		this,
-		controller,
+		&controller->session(),
 		static_cast<ListDelegate*>(this));
 	_inner->overrideIsChatWide(false);
 
@@ -1053,6 +1055,10 @@ void ShortcutMessages::listAddTranslatedItems(
 	not_null<TranslateTracker*> tracker) {
 }
 
+bool ShortcutMessages::listIgnorePaintEvent(QWidget *w, QPaintEvent *e) {
+	return false;
+}
+
 void ShortcutMessages::cornerButtonsShowAtPosition(
 		Data::MessagePosition position) {
 	showAtPosition(position);
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.h b/Telegram/SourceFiles/ui/chat/chat_style.h
index 6b8cc459ba059..f7499a2d05c42 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.h
+++ b/Telegram/SourceFiles/ui/chat/chat_style.h
@@ -223,6 +223,14 @@ struct ChatPaintContext {
 
 };
 
+struct ChatPaintContextArgs {
+	not_null<ChatTheme*> theme;
+	QRect clip;
+	QPoint visibleAreaPositionGlobal;
+	int visibleAreaTop = 0;
+	int visibleAreaWidth = 0;
+};
+
 [[nodiscard]] int HistoryServiceMsgRadius();
 [[nodiscard]] int HistoryServiceMsgInvertedRadius();
 [[nodiscard]] int HistoryServiceMsgInvertedShrink();
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 4580991e77eed..0162d71697aaa 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2951,7 +2951,7 @@ void SessionController::openPeerStories(
 }
 
 HistoryView::PaintContext SessionController::preparePaintContext(
-		PaintContextArgs &&args) {
+		Ui::ChatPaintContextArgs &&args) {
 	const auto visibleAreaTopLocal = content()->mapFromGlobal(
 		args.visibleAreaPositionGlobal).y();
 	const auto viewport = QRect(
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 4ff92675facc3..9888dc1c4c27b 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -64,6 +64,7 @@ struct ChatThemeBackground;
 struct ChatThemeBackgroundData;
 class MessageSendingAnimationController;
 struct BoostCounters;
+struct ChatPaintContextArgs;
 } // namespace Ui
 
 namespace Data {
@@ -586,15 +587,8 @@ class SessionController : public SessionNavigation {
 		PeerId peerId,
 		std::optional<Data::StorySourcesList> list = std::nullopt);
 
-	struct PaintContextArgs {
-		not_null<Ui::ChatTheme*> theme;
-		QRect clip;
-		QPoint visibleAreaPositionGlobal;
-		int visibleAreaTop = 0;
-		int visibleAreaWidth = 0;
-	};
 	[[nodiscard]] Ui::ChatPaintContext preparePaintContext(
-		PaintContextArgs &&args);
+		Ui::ChatPaintContextArgs &&args);
 	[[nodiscard]] not_null<const Ui::ChatStyle*> chatStyle() const {
 		return _chatStyle.get();
 	}

From 4427ae43065ba18d8caeefcda9bd5ebb37893714 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 May 2024 19:39:36 +0400
Subject: [PATCH 142/400] Empty preview widget on long userpic press.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../dialogs/dialogs_inner_widget.cpp          |  78 +++++++++++-
 .../dialogs/dialogs_inner_widget.h            |  13 +-
 .../view/history_view_chat_preview.cpp        | 113 ++++++++++++++++++
 .../history/view/history_view_chat_preview.h  |  26 ++++
 Telegram/SourceFiles/ui/chat/chat.style       |   9 ++
 6 files changed, 234 insertions(+), 7 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
 create mode 100644 Telegram/SourceFiles/history/view/history_view_chat_preview.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 88d42a190dc92..88778fc72615d 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -781,6 +781,8 @@ PRIVATE
     history/view/history_view_about_view.h
     history/view/history_view_bottom_info.cpp
     history/view/history_view_bottom_info.h
+    history/view/history_view_chat_preview.cpp
+    history/view/history_view_chat_preview.h
     history/view/history_view_contact_status.cpp
     history/view/history_view_contact_status.h
     history/view/history_view_context_menu.cpp
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index cdf2fef0dc706..fbf6eb5133df0 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -15,6 +15,7 @@ For license and copyright information please follow this link:
 #include "dialogs/dialogs_widget.h"
 #include "dialogs/dialogs_search_from_controllers.h"
 #include "dialogs/dialogs_search_tags.h"
+#include "history/view/history_view_chat_preview.h"
 #include "history/view/history_view_context_menu.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -80,6 +81,7 @@ namespace {
 
 constexpr auto kHashtagResultsLimit = 5;
 constexpr auto kStartReorderThreshold = 30;
+constexpr auto kChatPreviewDelay = crl::time(1000);
 
 int FixedOnTopDialogsCount(not_null<Dialogs::IndexedList*> list) {
 	auto result = 0;
@@ -157,6 +159,7 @@ InnerWidget::InnerWidget(
 	+ st::defaultDialogRow.padding.left())
 , _cancelSearchInChat(this, st::dialogsCancelSearchInPeer)
 , _cancelSearchFromUser(this, st::dialogsCancelSearchInPeer)
+, _chatPreviewTimer([=] { showChatPreview(); })
 , _childListShown(std::move(childListShown)) {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 
@@ -651,6 +654,8 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		context.active = active;
 		context.selected = _menuRow.key
 			? (row->key() == _menuRow.key)
+			: _chatPreviewKey
+			? (row->key() == _chatPreviewKey)
 			: selected;
 		context.topicJumpSelected = selected
 			&& _selectedTopicJump
@@ -1268,6 +1273,14 @@ void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
 		return;
 	}
 	selectByMouse(globalPosition);
+	if (!isUserpicPress()) {
+		cancelChatPreview();
+	}
+}
+
+void InnerWidget::cancelChatPreview() {
+	_chatPreviewTimer.cancel();
+	_chatPreviewWillBeFor = {};
 }
 
 void InnerWidget::clearIrrelevantState() {
@@ -1490,11 +1503,15 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 			row->repaint());
 	}
 	ClickHandler::pressed();
-	if (anim::Disabled()
+	if (pressShowsPreview()) {
+		_chatPreviewWillBeFor = computeChosenRow().key;
+		_chatPreviewTimer.callOnce(kChatPreviewDelay);
+	} else if (anim::Disabled()
 		&& (!_pressed || !_pressed->entry()->isPinnedDialog(_filterId))) {
 		mousePressReleased(e->globalPos(), e->button(), e->modifiers());
 	}
 }
+
 const std::vector<Key> &InnerWidget::pinnedChatsOrder() const {
 	const auto owner = &session().data();
 	return _savedSublists
@@ -1513,6 +1530,7 @@ void InnerWidget::checkReorderPinnedStart(QPoint localPosition) {
 		< style::ConvertScale(kStartReorderThreshold)) {
 		return;
 	}
+	cancelChatPreview();
 	_dragging = _pressed;
 	if (updateReorderIndexGetCount() < 2) {
 		_dragging = nullptr;
@@ -2288,6 +2306,33 @@ void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 	});
 }
 
+void InnerWidget::showChatPreview() {
+	const auto key = base::take(_chatPreviewWillBeFor);
+	cancelChatPreview();
+	if (!pressShowsPreview() || key != computeChosenRow().key) {
+		return;
+	}
+	ClickHandler::unpressed();
+	mousePressReleased(QCursor::pos(), Qt::NoButton, Qt::NoModifier);
+
+	_chatPreviewKey = key;
+	_menu = HistoryView::MakeChatPreview(this, key.entry());
+	if (!_menu) {
+		return;
+	}
+	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
+		if (_chatPreviewKey) {
+			updateDialogRow(RowDescriptor(base::take(_chatPreviewKey), {}));
+		}
+		const auto globalPosition = QCursor::pos();
+		if (rect().contains(mapFromGlobal(globalPosition))) {
+			setMouseTracking(true);
+			selectByMouse(globalPosition);
+		}
+	});
+	_menu->popup(_lastMousePosition.value_or(QCursor::pos()));
+}
+
 void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 	_menu = nullptr;
 
@@ -2316,7 +2361,9 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 		}
 		return RowDescriptor();
 	}();
-	if (!row.key) return;
+	if (!row.key) {
+		return;
+	}
 
 	_menuRow = row;
 	if (_pressButton != Qt::LeftButton) {
@@ -2555,6 +2602,12 @@ void InnerWidget::trackSearchResultsHistory(not_null<History*> history) {
 				refresh();
 				clearMouseSelection(true);
 			}
+			if (_chatPreviewWillBeFor.topic() == topic) {
+				_chatPreviewWillBeFor = {};
+			}
+			if (_chatPreviewKey.topic() == topic) {
+				_chatPreviewKey = {};
+			}
 		}, _searchResultsLifetime);
 	}
 }
@@ -3499,6 +3552,23 @@ ChosenRow InnerWidget::computeChosenRow() const {
 	return ChosenRow();
 }
 
+bool InnerWidget::isUserpicPress() const {
+	return  (_lastRowLocalMouseX >= 0)
+		&& (_lastRowLocalMouseX < _st->nameLeft)
+		&& (width() > _narrowWidth);
+}
+
+bool InnerWidget::pressShowsPreview() const {
+	if (!isUserpicPress()) {
+		return false;
+	}
+	const auto key = computeChosenRow().key;
+	if (const auto history = key.history()) {
+		return !history->peer->isForum();
+	}
+	return key.topic() != nullptr;;
+}
+
 bool InnerWidget::chooseRow(
 		Qt::KeyboardModifiers modifiers,
 		MsgId pressedTopicRootId) {
@@ -3511,9 +3581,7 @@ bool InnerWidget::chooseRow(
 			ChosenRow row,
 			Qt::KeyboardModifiers modifiers) {
 		row.newWindow = (modifiers & Qt::ControlModifier);
-		row.userpicClick = (_lastRowLocalMouseX >= 0)
-			&& (_lastRowLocalMouseX < _st->nameLeft)
-			&& (width() > _narrowWidth);
+		row.userpicClick = isUserpicPress();
 		return row;
 	};
 	auto chosen = modifyChosenRow(computeChosenRow(), modifiers);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 7699576c876aa..c8186e2eac7ac 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -7,14 +7,15 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/flags.h"
+#include "base/object_ptr.h"
+#include "base/timer.h"
 #include "dialogs/dialogs_key.h"
 #include "data/data_messages.h"
 #include "ui/dragging_scroll_manager.h"
 #include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
 #include "ui/userpic_view.h"
-#include "base/flags.h"
-#include "base/object_ptr.h"
 
 namespace style {
 struct DialogRow;
@@ -121,6 +122,10 @@ class InnerWidget final : public Ui::RpWidget {
 	void refreshEmptyLabel();
 	void resizeEmptyLabel();
 
+	[[nodiscard]] bool isUserpicPress() const;
+	[[nodiscard]] bool pressShowsPreview() const;
+	void cancelChatPreview();
+	void showChatPreview();
 	bool chooseRow(
 		Qt::KeyboardModifiers modifiers = {},
 		MsgId pressedTopicRootId = {});
@@ -514,6 +519,10 @@ class InnerWidget final : public Ui::RpWidget {
 	rpl::event_stream<QString> _completeHashtagRequests;
 	rpl::event_stream<> _refreshHashtagsRequests;
 
+	base::Timer _chatPreviewTimer;
+	Key _chatPreviewWillBeFor;
+	Key _chatPreviewKey;
+
 	rpl::variable<ChildListShown> _childListShown;
 	float64 _narrowRatio = 0.;
 	bool _geometryInited = false;
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
new file mode 100644
index 0000000000000..7779b8b28ddd5
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -0,0 +1,113 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_chat_preview.h"
+
+#include "data/data_peer.h"
+#include "history/history.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/menu/menu_item_base.h"
+#include "window/themes/window_theme.h"
+#include "window/section_widget.h"
+#include "styles/style_chat.h"
+
+namespace HistoryView {
+namespace {
+
+class Item final : public Ui::Menu::ItemBase {
+public:
+	Item(not_null<Ui::RpWidget*> parent, not_null<History*> history);
+
+	not_null<QAction*> action() const override;
+	bool isEnabled() const override;
+
+private:
+	void setupBackground();
+
+	int contentHeight() const override;
+
+	void paintEvent(QPaintEvent *e) override;
+
+	const not_null<QAction*> _dummyAction;
+	const std::shared_ptr<Ui::ChatTheme> _theme;
+
+	QImage _bg;
+
+};
+
+Item::Item(not_null<Ui::RpWidget*> parent, not_null<History*> history)
+: Ui::Menu::ItemBase(parent, st::previewMenu.menu)
+, _dummyAction(new QAction(parent))
+, _theme(Window::Theme::DefaultChatThemeOn(lifetime())) {
+	setPointerCursor(false);
+	setMinWidth(st::previewMenu.menu.widthMin);
+	resize(minWidth(), contentHeight());
+	setupBackground();
+}
+
+not_null<QAction*> Item::action() const {
+	return _dummyAction;
+}
+
+bool Item::isEnabled() const {
+	return false;
+}
+
+int Item::contentHeight() const {
+	return st::previewMenu.maxHeight;
+}
+
+void Item::setupBackground() {
+	const auto ratio = style::DevicePixelRatio();
+	_bg = QImage(
+		size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+
+	const auto paint = [=] {
+		auto p = QPainter(&_bg);
+		Window::SectionWidget::PaintBackground(
+			p,
+			_theme.get(),
+			QSize(width(), height() * 2),
+			QRect(QPoint(), size()));
+	};
+	paint();
+	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
+		paint();
+		update();
+	}, lifetime());
+}
+
+void Item::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	p.drawImage(0, 0, _bg);
+}
+
+} // namespace
+
+base::unique_qptr<Ui::PopupMenu> MakeChatPreview(
+		QWidget *parent,
+		not_null<Dialogs::Entry*> entry) {
+	if (const auto topic = entry->asTopic()) {
+		return nullptr;
+	}
+	const auto history = entry->asHistory();
+	if (!history || history->peer->isForum()) {
+		return nullptr;
+	}
+
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::previewMenu);
+
+	result->addAction(base::make_unique_q<Item>(result.get(), history));
+
+	return result;
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.h b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
new file mode 100644
index 0000000000000..12a35bbba9823
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
@@ -0,0 +1,26 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/unique_qptr.h"
+
+namespace Dialogs {
+class Entry;
+} // namespace Dialogs
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace HistoryView {
+
+[[nodiscard]] base::unique_qptr<Ui::PopupMenu> MakeChatPreview(
+	QWidget *parent,
+	not_null<Dialogs::Entry*> entry);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 5dd77998a2da1..c72097f255430 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1076,3 +1076,12 @@ liveLocationLongInIconSelected: icon {{ "chat/live_location_long", msgInServiceF
 liveLocationLongOutIcon: icon {{ "chat/live_location_long", msgOutServiceFg }};
 liveLocationLongOutIconSelected: icon {{ "chat/live_location_long", msgOutServiceFgSelected }};
 liveLocationRemainingSize: 28px;
+
+previewMenu: PopupMenu(defaultPopupMenu) {
+	scrollPadding: margins(0px, 0px, 0px, 0px);
+	menu: Menu(defaultMenu) {
+		widthMin: 380px;
+		widthMax: 380px;
+	}
+	maxHeight: 420px;
+}

From da31fef1ae7e512dd1591476c3a24b81ae8353d7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 11:26:39 +0400
Subject: [PATCH 143/400] Show long-press preview of topics.

---
 .../view/history_view_chat_preview.cpp        | 463 +++++++++++++++++-
 .../history/view/history_view_element.h       |   1 +
 .../history/view/history_view_message.cpp     |   2 +
 Telegram/SourceFiles/ui/chat/chat.style       |   2 +
 4 files changed, 455 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 7779b8b28ddd5..c394af68bbc64 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -7,10 +7,19 @@ For license and copyright information please follow this link:
 */
 #include "history/view/history_view_chat_preview.h"
 
+#include "data/data_forum_topic.h"
 #include "data/data_peer.h"
+#include "data/data_replies_list.h"
+#include "data/data_thread.h"
+#include "history/view/reactions/history_view_reactions_button.h"
+#include "history/view/history_view_list_widget.h"
 #include "history/history.h"
+#include "history/history_item.h"
+#include "main/main_session.h"
+#include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/menu/menu_item_base.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
@@ -19,35 +28,159 @@ For license and copyright information please follow this link:
 namespace HistoryView {
 namespace {
 
-class Item final : public Ui::Menu::ItemBase {
+class Item final
+	: public Ui::Menu::ItemBase
+	, private HistoryView::ListDelegate {
 public:
-	Item(not_null<Ui::RpWidget*> parent, not_null<History*> history);
+	Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread);
 
 	not_null<QAction*> action() const override;
 	bool isEnabled() const override;
 
 private:
-	void setupBackground();
-
 	int contentHeight() const override;
-
 	void paintEvent(QPaintEvent *e) override;
 
+	void setupBackground();
+	void updateInnerVisibleArea();
+
+	Context listContext() override;
+	bool listScrollTo(int top, bool syntetic = true) override;
+	void listCancelRequest() override;
+	void listDeleteRequest() override;
+	void listTryProcessKeyInput(not_null<QKeyEvent*> e) override;
+	rpl::producer<Data::MessagesSlice> listSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) override;
+	bool listAllowsMultiSelect() override;
+	bool listIsItemGoodForSelection(not_null<HistoryItem*> item) override;
+	bool listIsLessInOrder(
+		not_null<HistoryItem*> first,
+		not_null<HistoryItem*> second) override;
+	void listSelectionChanged(SelectedItems &&items) override;
+	void listMarkReadTill(not_null<HistoryItem*> item) override;
+	void listMarkContentsRead(
+		const base::flat_set<not_null<HistoryItem*>> &items) override;
+	MessagesBarData listMessagesBar(
+		const std::vector<not_null<Element*>> &elements) override;
+	void listContentRefreshed() override;
+	void listUpdateDateLink(
+		ClickHandlerPtr &link,
+		not_null<Element*> view) override;
+	bool listElementHideReply(not_null<const Element*> view) override;
+	bool listElementShownUnread(not_null<const Element*> view) override;
+	bool listIsGoodForAroundPosition(
+		not_null<const Element*> view) override;
+	void listSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) override;
+	void listSearch(
+		const QString &query,
+		const FullMsgId &context) override;
+	void listHandleViaClick(not_null<UserData*> bot) override;
+	not_null<Ui::ChatTheme*> listChatTheme() override;
+	CopyRestrictionType listCopyRestrictionType(
+		HistoryItem *item) override;
+	CopyRestrictionType listCopyRestrictionType() {
+		return listCopyRestrictionType(nullptr);
+	}
+	CopyRestrictionType listCopyMediaRestrictionType(
+		not_null<HistoryItem*> item) override;
+	CopyRestrictionType listSelectRestrictionType() override;
+	auto listAllowedReactionsValue()
+		-> rpl::producer<Data::AllowedReactions> override;
+	void listShowPremiumToast(not_null<DocumentData*> document) override;
+	void listOpenPhoto(
+		not_null<PhotoData*> photo,
+		FullMsgId context) override;
+	void listOpenDocument(
+		not_null<DocumentData*> document,
+		FullMsgId context,
+		bool showInMediaView) override;
+	void listPaintEmpty(
+		Painter &p,
+		const Ui::ChatPaintContext &context) override;
+	QString listElementAuthorRank(not_null<const Element*> view) override;
+	History *listTranslateHistory() override;
+	void listAddTranslatedItems(
+		not_null<TranslateTracker*> tracker) override;
+	not_null<Window::SessionController*> listWindow() override;
+	not_null<const Ui::ChatStyle*> listChatStyle() override;
+	rpl::producer<bool> listChatWideValue() override;
+	std::unique_ptr<Reactions::Manager> listMakeReactionsManager(
+		QWidget *wheelEventsTarget,
+		Fn<void(QRect)> update) override;
+	void listVisibleAreaUpdated() override;
+	std::shared_ptr<Ui::Show> listUiShow() override;
+	void listShowPollResults(
+		not_null<PollData*> poll,
+		FullMsgId context) override;
+	void listCancelUploadLayer(not_null<HistoryItem*> item) override;
+	bool listAnimationsPaused() override;
+	auto listSendingAnimation()
+		-> Ui::MessageSendingAnimationController* override;
+	Ui::ChatPaintContext listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) override;
+	bool listMarkingContentRead() override;
+	bool listIgnorePaintEvent(QWidget *w, QPaintEvent *e) override;
+	bool listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) override;
+	void listWindowSetInnerFocus() override;
+	bool listAllowsDragForward() override;
+	void listLaunchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> finished) override;
+
 	const not_null<QAction*> _dummyAction;
+	const not_null<Main::Session*> _session;
+	const not_null<Data::Thread*> _thread;
+	const not_null<History*> _history;
+	const not_null<PeerData*> _peer;
 	const std::shared_ptr<Ui::ChatTheme> _theme;
+	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
+	const std::unique_ptr<Ui::ElasticScroll> _scroll;
+
+	QPointer<HistoryView::ListWidget> _inner;
 
 	QImage _bg;
 
 };
 
-Item::Item(not_null<Ui::RpWidget*> parent, not_null<History*> history)
+Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 : Ui::Menu::ItemBase(parent, st::previewMenu.menu)
 , _dummyAction(new QAction(parent))
-, _theme(Window::Theme::DefaultChatThemeOn(lifetime())) {
+, _session(&thread->session())
+, _thread(thread)
+, _history(thread->owningHistory())
+, _peer(thread->peer())
+, _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
+, _chatStyle(std::make_unique<Ui::ChatStyle>(_session->colorIndicesValue()))
+, _scroll(std::make_unique<Ui::ElasticScroll>(this)) {
 	setPointerCursor(false);
 	setMinWidth(st::previewMenu.menu.widthMin);
 	resize(minWidth(), contentHeight());
 	setupBackground();
+
+	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
+		this,
+		_session,
+		static_cast<ListDelegate*>(this)));
+	_scroll->setGeometry(rect());
+	_scroll->scrolls(
+	) | rpl::start_with_next([=] {
+		updateInnerVisibleArea();
+	}, lifetime());
+	_scroll->setOverscrollBg(QColor(0, 0, 0, 0));
+	using Type = Ui::ElasticScroll::OverscrollType;
+	_scroll->setOverscrollTypes(Type::Real, Type::Real);
+
+	_inner->resizeToWidth(_scroll->width(), _scroll->height());
+
+	_inner->refreshViewer();
+
+	_inner->setAttribute(Qt::WA_TransparentForMouseEvents);
 }
 
 not_null<QAction*> Item::action() const {
@@ -88,24 +221,328 @@ void Item::paintEvent(QPaintEvent *e) {
 	p.drawImage(0, 0, _bg);
 }
 
+void Item::updateInnerVisibleArea() {
+	const auto scrollTop = _scroll->scrollTop();
+	_inner->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
+}
+
+Context Item::listContext() {
+	return Context::ChatPreview;
+}
+
+bool Item::listScrollTo(int top, bool syntetic) {
+	top = std::clamp(top, 0, _scroll->scrollTopMax());
+	if (_scroll->scrollTop() == top) {
+		updateInnerVisibleArea();
+		return false;
+	}
+	_scroll->scrollToY(top);
+	return true;
+}
+
+void Item::listCancelRequest() {
+}
+
+void Item::listDeleteRequest() {
+}
+
+void Item::listTryProcessKeyInput(not_null<QKeyEvent*> e) {
+}
+
+rpl::producer<Data::MessagesSlice> Item::listSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	if (const auto topic = _thread->asTopic()) {
+		return topic->replies()->source(
+			aroundId,
+			limitBefore,
+			limitAfter
+		) | rpl::before_next([=] { // after_next makes a copy of value.
+			//if (!_loaded) {
+			//	_loaded = true;
+			//	crl::on_main(this, [=] {
+			//		updatePinnedVisibility();
+			//	});
+			//}
+		});
+	}
+	// #TODO
+	//const auto messageId = aroundId.fullId.msg
+	//	? aroundId.fullId.msg
+	//	: (ServerMaxMsgId - 1);
+
+	//return SharedMediaMergedViewer(
+	//	&_thread->session(),
+	//	SharedMediaMergedKey(
+	//		SparseIdsMergedSlice::Key(
+	//			_history->peer->id,
+	//			_thread->topicRootId(),
+	//			_migratedPeer ? _migratedPeer->id : 0,
+	//			messageId),
+	//		Storage::SharedMediaType::Pinned),
+	//	limitBefore,
+	//	limitAfter
+	//) | rpl::map([=](SparseIdsMergedSlice &&slice) {
+	//	auto result = Data::MessagesSlice();
+	//	result.fullCount = slice.fullCount();
+	//	result.skippedAfter = slice.skippedAfter();
+	//	result.skippedBefore = slice.skippedBefore();
+	//	const auto count = slice.size();
+	//	result.ids.reserve(count);
+	//	if (const auto msgId = slice.nearest(messageId)) {
+	//		result.nearestToAround = *msgId;
+	//	}
+	//	for (auto i = 0; i != count; ++i) {
+	//		result.ids.push_back(slice[i]);
+	//	}
+	//	return result;
+	//});
+	return rpl::single(Data::MessagesSlice());
+}
+
+bool Item::listAllowsMultiSelect() {
+	return false;
+}
+
+bool Item::listIsItemGoodForSelection(not_null<HistoryItem*> item) {
+	return false;
+}
+
+bool Item::listIsLessInOrder(
+		not_null<HistoryItem*> first,
+		not_null<HistoryItem*> second) {
+	if (first->isRegular() && second->isRegular()) {
+		const auto firstPeer = first->history()->peer;
+		const auto secondPeer = second->history()->peer;
+		if (firstPeer == secondPeer) {
+			return first->id < second->id;
+		} else if (firstPeer->isChat()) {
+			return true;
+		}
+		return false;
+	} else if (first->isRegular()) {
+		return true;
+	} else if (second->isRegular()) {
+		return false;
+	}
+	return first->id < second->id;
+}
+
+void Item::listSelectionChanged(SelectedItems &&items) {
+}
+
+void Item::listMarkReadTill(not_null<HistoryItem*> item) {
+}
+
+void Item::listMarkContentsRead(
+	const base::flat_set<not_null<HistoryItem*>> &items) {
+}
+
+MessagesBarData Item::listMessagesBar(
+		const std::vector<not_null<Element*>> &elements) {
+	return {};// #TODO
+}
+
+void Item::listContentRefreshed() {
+}
+
+void Item::listUpdateDateLink(
+	ClickHandlerPtr &link,
+	not_null<Element*> view) {
+}
+
+bool Item::listElementHideReply(not_null<const Element*> view) {
+	return false;
+}
+
+bool Item::listElementShownUnread(not_null<const Element*> view) {
+	return view->data()->unread(view->data()->history());
+}
+
+bool Item::listIsGoodForAroundPosition(not_null<const Element*> view) {
+	return view->data()->isRegular();
+}
+
+void Item::listSendBotCommand(
+	const QString &command,
+	const FullMsgId &context) {
+}
+
+void Item::listSearch(
+	const QString &query,
+	const FullMsgId &context) {
+}
+
+void Item::listHandleViaClick(not_null<UserData*> bot) {
+}
+
+not_null<Ui::ChatTheme*> Item::listChatTheme() {
+	return _theme.get();
+}
+
+CopyRestrictionType Item::listCopyRestrictionType(HistoryItem *item) {
+	return CopyRestrictionType::None;
+}
+
+CopyRestrictionType Item::listCopyMediaRestrictionType(
+		not_null<HistoryItem*> item) {
+	return CopyRestrictionType::None;
+}
+
+CopyRestrictionType Item::listSelectRestrictionType() {
+	return CopyRestrictionType::None;
+}
+
+auto Item::listAllowedReactionsValue()
+-> rpl::producer<Data::AllowedReactions> {
+	return rpl::single(Data::AllowedReactions());
+}
+
+void Item::listShowPremiumToast(not_null<DocumentData*> document) {
+}
+
+void Item::listOpenPhoto(
+	not_null<PhotoData*> photo,
+	FullMsgId context) {
+}
+
+void Item::listOpenDocument(
+	not_null<DocumentData*> document,
+	FullMsgId context,
+	bool showInMediaView) {
+}
+
+void Item::listPaintEmpty(
+	Painter &p,
+	const Ui::ChatPaintContext &context) {
+	// #TODO
+}
+
+QString Item::listElementAuthorRank(not_null<const Element*> view) {
+	return {};
+}
+
+History *Item::listTranslateHistory() {
+	return nullptr;
+}
+
+void Item::listAddTranslatedItems(
+	not_null<TranslateTracker*> tracker) {
+}
+
+not_null<Window::SessionController*> Item::listWindow() {
+	Unexpected("Item::listWindow.");
+}
+
+not_null<const Ui::ChatStyle*> Item::listChatStyle() {
+	return _chatStyle.get();
+}
+
+rpl::producer<bool> Item::listChatWideValue() {
+	return rpl::single(false);
+}
+
+std::unique_ptr<Reactions::Manager> Item::listMakeReactionsManager(
+		QWidget *wheelEventsTarget,
+		Fn<void(QRect)> update) {
+	return nullptr;
+}
+
+void Item::listVisibleAreaUpdated() {
+}
+
+std::shared_ptr<Ui::Show> Item::listUiShow() {
+	Unexpected("Item::listUiShow.");
+}
+
+void Item::listShowPollResults(
+	not_null<PollData*> poll,
+	FullMsgId context) {
+}
+
+void Item::listCancelUploadLayer(not_null<HistoryItem*> item) {
+}
+
+bool Item::listAnimationsPaused() {
+	return false;
+}
+
+auto Item::listSendingAnimation()
+-> Ui::MessageSendingAnimationController* {
+	return nullptr;
+}
+
+Ui::ChatPaintContext Item::listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) {
+	const auto visibleAreaTopLocal = mapFromGlobal(
+		args.visibleAreaPositionGlobal).y();
+	const auto viewport = QRect(
+		0,
+		args.visibleAreaTop - visibleAreaTopLocal,
+		args.visibleAreaWidth,
+		height());
+	return args.theme->preparePaintContext(
+		_chatStyle.get(),
+		viewport,
+		args.clip,
+		false);
+}
+
+bool Item::listMarkingContentRead() {
+	return false;
+}
+
+bool Item::listIgnorePaintEvent(QWidget *w, QPaintEvent *e) {
+	return false;
+}
+
+bool Item::listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) {
+	return false;
+}
+
+void Item::listWindowSetInnerFocus() {
+}
+
+bool Item::listAllowsDragForward() {
+	return false;
+}
+
+void Item::listLaunchDrag(
+	std::unique_ptr<QMimeData> data,
+	Fn<void()> finished) {
+}
+
 } // namespace
 
 base::unique_qptr<Ui::PopupMenu> MakeChatPreview(
 		QWidget *parent,
 		not_null<Dialogs::Entry*> entry) {
-	if (const auto topic = entry->asTopic()) {
-		return nullptr;
-	}
-	const auto history = entry->asHistory();
-	if (!history || history->peer->isForum()) {
+	const auto thread = entry->asThread();
+	if (!thread) {
 		return nullptr;
+	} else if (const auto history = entry->asHistory()) {
+		if (history->peer->isForum()) {
+			return nullptr;
+		}
 	}
 
 	auto result = base::make_unique_q<Ui::PopupMenu>(
 		parent,
 		st::previewMenu);
 
-	result->addAction(base::make_unique_q<Item>(result.get(), history));
+	result->addAction(base::make_unique_q<Item>(result.get(), thread));
+	if (const auto topic = thread->asTopic()) {
+		const auto weak = Ui::MakeWeak(result.get());
+		topic->destroyed() | rpl::start_with_next([weak] {
+			if (const auto strong = weak.data()) {
+				LOG(("Preview hidden for a destroyed topic."));
+				strong->hideMenu(true);
+			}
+		}, result->lifetime());
+	}
 
 	return result;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 6db33ff4b91d6..a11d0831dd3b9 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -61,6 +61,7 @@ enum class Context : char {
 	TTLViewer,
 	ShortcutMessages,
 	ScheduledTopic,
+	ChatPreview,
 };
 
 enum class OnlyEmojiAndSpaces : char {
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 4eddd3b49da33..cc0b4aec747d6 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -2081,6 +2081,7 @@ bool Message::hasFromPhoto() const {
 	case Context::AdminLog:
 		return true;
 	case Context::History:
+	case Context::ChatPreview:
 	case Context::TTLViewer:
 	case Context::Pinned:
 	case Context::Replies:
@@ -3281,6 +3282,7 @@ bool Message::hasFromName() const {
 	case Context::AdminLog:
 		return true;
 	case Context::History:
+	case Context::ChatPreview:
 	case Context::TTLViewer:
 	case Context::Pinned:
 	case Context::Replies:
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index c72097f255430..5c2cbf99db291 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1084,4 +1084,6 @@ previewMenu: PopupMenu(defaultPopupMenu) {
 		widthMax: 380px;
 	}
 	maxHeight: 420px;
+	radius: boxRadius;
+	shadow: boxRoundShadow;
 }

From 68df8448a2fe9a915f7e268190921428065eeb5d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 11:50:44 +0400
Subject: [PATCH 144/400] Use arc_angles.h from lib_ui.

---
 .../history/view/media/history_view_location.cpp |  5 ++++-
 Telegram/SourceFiles/ui/arc_angles.h             | 16 ----------------
 Telegram/cmake/td_ui.cmake                       |  1 -
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 Telegram/SourceFiles/ui/arc_angles.h

diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.cpp b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
index f16d65141c678..5b8b18e61b31d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_location.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
@@ -509,7 +509,10 @@ void Location::paintLiveRemaining(
 			auto pen = QPen(color);
 			pen.setWidthF(stroke);
 			p.setPen(pen);
-			p.drawArc(rect, 90 * 16, int(base::SafeRound(360 * 16 * progress)));
+			p.drawArc(
+				rect,
+				arc::kQuarterLength,
+				int(base::SafeRound(arc::kFullLength * progress)));
 		}
 
 		p.setPen(stm->msgServiceFg);
diff --git a/Telegram/SourceFiles/ui/arc_angles.h b/Telegram/SourceFiles/ui/arc_angles.h
deleted file mode 100644
index cfaa59b943020..0000000000000
--- a/Telegram/SourceFiles/ui/arc_angles.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-namespace arc {
-
-constexpr auto kFullLength = 360 * 16;
-constexpr auto kQuarterLength = (kFullLength / 4);
-constexpr auto kHalfLength = (kFullLength / 2);
-
-} // namespace arc
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 61c9012c1050b..da2ea224d9c64 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -396,7 +396,6 @@ PRIVATE
     ui/widgets/vertical_drum_picker.cpp
     ui/widgets/vertical_drum_picker.h
 
-    ui/arc_angles.h
     ui/cached_round_corners.cpp
     ui/cached_round_corners.h
     ui/color_contrast.cpp

From f223ae7eeeb83ecd097ae528ec64f756db383ba5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 14:47:08 +0400
Subject: [PATCH 145/400] Implement chats preview, show from unread.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/SourceFiles/apiwrap.cpp              |  41 ++++
 Telegram/SourceFiles/apiwrap.h                |  18 +-
 .../data/data_history_messages.cpp            | 212 ++++++++++++++++++
 .../SourceFiles/data/data_history_messages.h  |  67 ++++++
 Telegram/SourceFiles/data/data_replies_list.h |   4 -
 .../data/data_search_controller.cpp           |  55 +++++
 .../SourceFiles/data/data_search_controller.h |  19 +-
 Telegram/SourceFiles/history/history.cpp      |  86 +++++--
 Telegram/SourceFiles/history/history.h        |  34 +--
 Telegram/SourceFiles/history/history_item.cpp |  11 +
 Telegram/SourceFiles/history/history_item.h   |   1 +
 .../view/history_view_chat_preview.cpp        |  92 ++++----
 .../history/view/history_view_list_widget.cpp |   4 +-
 .../storage/storage_sparse_ids_list.cpp       |  17 +-
 Telegram/SourceFiles/ui/chat/chat.style       |   3 +
 16 files changed, 570 insertions(+), 96 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_history_messages.cpp
 create mode 100644 Telegram/SourceFiles/data/data_history_messages.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 88778fc72615d..6426c644676ac 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -539,6 +539,8 @@ PRIVATE
     data/data_groups.h
     data/data_histories.cpp
     data/data_histories.h
+    data/data_history_messages.cpp
+    data/data_history_messages.h
     data/data_lastseen_status.h
     data/data_location.cpp
     data/data_location.h
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index aeed9e1b3e159..32e97c77f1d85 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -50,6 +50,7 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "data/data_chat_filters.h"
 #include "data/data_histories.h"
+#include "data/data_history_messages.h"
 #include "core/core_cloud_password.h"
 #include "core/application.h"
 #include "base/unixtime.h"
@@ -3078,6 +3079,46 @@ void ApiWrap::resolveJumpToHistoryDate(
 	}
 }
 
+void ApiWrap::requestHistory(
+		not_null<History*> history,
+		MsgId messageId,
+		SliceType slice) {
+	const auto peer = history->peer;
+	const auto key = HistoryRequest{
+		peer,
+		messageId,
+		slice,
+	};
+	if (_historyRequests.contains(key)) {
+		return;
+	}
+
+	const auto prepared = Api::PrepareHistoryRequest(peer, messageId, slice);
+	auto &histories = history->owner().histories();
+	const auto requestType = Data::Histories::RequestType::History;
+	histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
+		return request(
+			std::move(prepared)
+		).done([=](const Api::HistoryRequestResult &result) {
+			_historyRequests.remove(key);
+			auto parsed = Api::ParseHistoryResult(
+				peer,
+				messageId,
+				slice,
+				result);
+			history->messages().addSlice(
+				std::move(parsed.messageIds),
+				parsed.noSkipRange,
+				parsed.fullCount);
+			finish();
+		}).fail([=] {
+			_historyRequests.remove(key);
+			finish();
+		}).send();
+	});
+	_historyRequests.emplace(key);
+}
+
 void ApiWrap::requestSharedMedia(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index b1c844702850e..9710ee1bd8291 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -274,6 +274,10 @@ class ApiWrap final : public MTP::Sender {
 		Fn<void(not_null<PeerData*>, MsgId)> callback);
 
 	using SliceType = Data::LoadDirection;
+	void requestHistory(
+		not_null<History*> history,
+		MsgId messageId,
+		SliceType slice);
 	void requestSharedMedia(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
@@ -511,7 +515,8 @@ class ApiWrap final : public MTP::Sender {
 		not_null<PeerData*> peer,
 		bool justClear,
 		bool revoke);
-	void applyAffectedMessages(const MTPmessages_AffectedMessages &result) const;
+	void applyAffectedMessages(
+		const MTPmessages_AffectedMessages &result) const;
 
 	void deleteAllFromParticipantSend(
 		not_null<ChannelData*> channel,
@@ -645,6 +650,17 @@ class ApiWrap final : public MTP::Sender {
 	};
 	base::flat_set<SharedMediaRequest> _sharedMediaRequests;
 
+	struct HistoryRequest {
+		not_null<PeerData*> peer;
+		MsgId aroundId = 0;
+		SliceType sliceType = {};
+
+		friend inline auto operator<=>(
+			const HistoryRequest&,
+			const HistoryRequest&) = default;
+	};
+	base::flat_set<HistoryRequest> _historyRequests;
+
 	std::unique_ptr<DialogsLoadState> _dialogsLoadState;
 	TimeId _dialogsLoadTill = 0;
 	rpl::variable<bool> _dialogsLoadMayBlockByDate = false;
diff --git a/Telegram/SourceFiles/data/data_history_messages.cpp b/Telegram/SourceFiles/data/data_history_messages.cpp
new file mode 100644
index 0000000000000..7c29daf9e2f1a
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_history_messages.cpp
@@ -0,0 +1,212 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_history_messages.h"
+
+#include "apiwrap.h"
+#include "data/data_chat.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_sparse_ids.h"
+#include "history/history.h"
+#include "main/main_session.h"
+
+namespace Data {
+
+void HistoryMessages::addNew(MsgId messageId) {
+	_chat.addNew(messageId);
+}
+
+void HistoryMessages::addExisting(MsgId messageId, MsgRange noSkipRange) {
+	_chat.addExisting(messageId, noSkipRange);
+}
+
+void HistoryMessages::addSlice(
+		std::vector<MsgId> &&messageIds,
+		MsgRange noSkipRange,
+		std::optional<int> count) {
+	_chat.addSlice(std::move(messageIds), noSkipRange, count);
+}
+
+void HistoryMessages::removeOne(MsgId messageId) {
+	_chat.removeOne(messageId);
+	_oneRemoved.fire_copy(messageId);
+}
+
+void HistoryMessages::removeAll() {
+	_chat.removeAll();
+	_allRemoved.fire({});
+}
+
+void HistoryMessages::invalidateBottom() {
+	_chat.invalidateBottom();
+	_bottomInvalidated.fire({});
+}
+
+Storage::SparseIdsListResult HistoryMessages::snapshot(
+		const Storage::SparseIdsListQuery &query) const {
+	return _chat.snapshot(query);
+}
+
+auto HistoryMessages::sliceUpdated() const
+-> rpl::producer<Storage::SparseIdsSliceUpdate> {
+	return _chat.sliceUpdated();
+}
+
+rpl::producer<MsgId> HistoryMessages::oneRemoved() const {
+	return _oneRemoved.events();
+}
+
+rpl::producer<> HistoryMessages::allRemoved() const {
+	return _allRemoved.events();
+}
+
+rpl::producer<> HistoryMessages::bottomInvalidated() const {
+	return _bottomInvalidated.events();
+}
+
+rpl::producer<SparseIdsSlice> HistoryViewer(
+		not_null<History*> history,
+		MsgId aroundId,
+		int limitBefore,
+		int limitAfter) {
+	Expects(IsServerMsgId(aroundId) || (aroundId == 0));
+	Expects((aroundId != 0) || (limitBefore == 0 && limitAfter == 0));
+
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		const auto messages = &history->messages();
+
+		auto builder = lifetime.make_state<SparseIdsSliceBuilder>(
+			aroundId,
+			limitBefore,
+			limitAfter);
+		using RequestAroundInfo = SparseIdsSliceBuilder::AroundData;
+		builder->insufficientAround(
+		) | rpl::start_with_next([=](const RequestAroundInfo &info) {
+			history->session().api().requestHistory(
+				history,
+				info.aroundId,
+				info.direction);
+		}, lifetime);
+
+		auto pushNextSnapshot = [=] {
+			consumer.put_next(builder->snapshot());
+		};
+
+		using SliceUpdate = Storage::SparseIdsSliceUpdate;
+		messages->sliceUpdated(
+		) | rpl::filter([=](const SliceUpdate &update) {
+			return builder->applyUpdate(update);
+		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+
+		messages->oneRemoved(
+		) | rpl::filter([=](MsgId messageId) {
+			return builder->removeOne(messageId);
+		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+
+		messages->allRemoved(
+		) | rpl::filter([=] {
+			return builder->removeAll();
+		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+
+		messages->bottomInvalidated(
+		) | rpl::filter([=] {
+			return builder->invalidateBottom();
+		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+
+		const auto snapshot = messages->snapshot({
+			aroundId,
+			limitBefore,
+			limitAfter,
+		});
+		if (snapshot.count || !snapshot.messageIds.empty()) {
+			if (builder->applyInitial(snapshot)) {
+				pushNextSnapshot();
+			}
+		}
+		builder->checkInsufficient();
+
+		return lifetime;
+	};
+}
+
+rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
+		not_null<History*> history,
+		/*Universal*/MsgId universalAroundId,
+		int limitBefore,
+		int limitAfter) {
+	const auto migrateFrom = history->peer->migrateFrom();
+	auto createSimpleViewer = [=](
+			PeerId peerId,
+			MsgId topicRootId,
+			SparseIdsSlice::Key simpleKey,
+			int limitBefore,
+			int limitAfter) {
+		const auto chosen = (history->peer->id == peerId)
+			? history
+			: history->owner().history(peerId);
+		return HistoryViewer(history, simpleKey, limitBefore, limitAfter);
+	};
+	const auto peerId = history->peer->id;
+	const auto topicRootId = MsgId();
+	const auto migratedPeerId = migrateFrom ? migrateFrom->id : peerId;
+	using Key = SparseIdsMergedSlice::Key;
+	return SparseIdsMergedSlice::CreateViewer(
+		Key(peerId, topicRootId, migratedPeerId, universalAroundId),
+		limitBefore,
+		limitAfter,
+		std::move(createSimpleViewer));
+}
+
+rpl::producer<MessagesSlice> HistoryMessagesViewer(
+		not_null<History*> history,
+		MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	const auto computeUnreadAroundId = [&] {
+		if (const auto migrated = history->migrateFrom()) {
+			if (const auto around = migrated->loadAroundId()) {
+				return MsgId(around - ServerMaxMsgId);
+			}
+		}
+		if (const auto around = history->loadAroundId()) {
+			return around;
+		}
+		return MsgId(ServerMaxMsgId - 1);
+	};
+	const auto messageId = (aroundId.fullId.msg == ShowAtUnreadMsgId)
+		? computeUnreadAroundId()
+		: (aroundId.fullId.msg == ShowAtTheEndMsgId)
+		? (ServerMaxMsgId - 1)
+		: (aroundId.fullId.peer == history->peer->id)
+		? aroundId.fullId.msg
+		: (aroundId.fullId.msg - ServerMaxMsgId);
+	return HistoryMergedViewer(
+		history,
+		messageId,
+		limitBefore,
+		limitAfter
+	) | rpl::map([=](SparseIdsMergedSlice &&slice) {
+		auto result = Data::MessagesSlice();
+		result.fullCount = slice.fullCount();
+		result.skippedAfter = slice.skippedAfter();
+		result.skippedBefore = slice.skippedBefore();
+		const auto count = slice.size();
+		result.ids.reserve(count);
+		if (const auto msgId = slice.nearest(messageId)) {
+			result.nearestToAround = *msgId;
+		}
+		for (auto i = 0; i != count; ++i) {
+			result.ids.push_back(slice[i]);
+		}
+		return result;
+	});
+}
+
+} // namespace Data
\ No newline at end of file
diff --git a/Telegram/SourceFiles/data/data_history_messages.h b/Telegram/SourceFiles/data/data_history_messages.h
new file mode 100644
index 0000000000000..2b68462fb503b
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_history_messages.h
@@ -0,0 +1,67 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "storage/storage_sparse_ids_list.h"
+
+class History;
+class SparseIdsSlice;
+class SparseIdsMergedSlice;
+
+namespace Data {
+
+struct MessagesSlice;
+struct MessagePosition;
+
+class HistoryMessages final {
+public:
+	void addNew(MsgId messageId);
+	void addExisting(MsgId messageId, MsgRange noSkipRange);
+	void addSlice(
+		std::vector<MsgId> &&messageIds,
+		MsgRange noSkipRange,
+		std::optional<int> count);
+	void removeOne(MsgId messageId);
+	void removeAll();
+	void invalidateBottom();
+
+	[[nodiscard]] Storage::SparseIdsListResult snapshot(
+		const Storage::SparseIdsListQuery &query) const;
+	[[nodiscard]] auto sliceUpdated() const
+		-> rpl::producer<Storage::SparseIdsSliceUpdate>;
+	[[nodiscard]] rpl::producer<MsgId> oneRemoved() const;
+	[[nodiscard]] rpl::producer<> allRemoved() const;
+	[[nodiscard]] rpl::producer<> bottomInvalidated() const;
+
+private:
+	Storage::SparseIdsList _chat;
+	rpl::event_stream<MsgId> _oneRemoved;
+	rpl::event_stream<> _allRemoved;
+	rpl::event_stream<> _bottomInvalidated;
+
+};
+
+[[nodiscard]] rpl::producer<SparseIdsSlice> HistoryViewer(
+	not_null<History*> history,
+	MsgId aroundId,
+	int limitBefore,
+	int limitAfter);
+
+[[nodiscard]] rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
+	not_null<History*> history,
+	/*Universal*/MsgId universalAroundId,
+	int limitBefore,
+	int limitAfter);
+
+[[nodiscard]] rpl::producer<MessagesSlice> HistoryMessagesViewer(
+	not_null<History*> history,
+	MessagePosition aroundId,
+	int limitBefore,
+	int limitAfter);
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_replies_list.h b/Telegram/SourceFiles/data/data_replies_list.h
index a33dee56b5264..42f56c1aec7eb 100644
--- a/Telegram/SourceFiles/data/data_replies_list.h
+++ b/Telegram/SourceFiles/data/data_replies_list.h
@@ -78,10 +78,6 @@ class RepliesList final : public base::has_weak_ptr {
 	[[nodiscard]] Histories &histories();
 
 	void subscribeToUpdates();
-	[[nodiscard]] rpl::producer<MessagesSlice> sourceFromServer(
-		MessagePosition aroundId,
-		int limitBefore,
-		int limitAfter);
 	void appendClientSideMessages(MessagesSlice &slice);
 
 	[[nodiscard]] bool buildFromData(not_null<Viewer*> viewer);
diff --git a/Telegram/SourceFiles/data/data_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp
index 43c5efb66d65c..4e33a9eaa5282 100644
--- a/Telegram/SourceFiles/data/data_search_controller.cpp
+++ b/Telegram/SourceFiles/data/data_search_controller.cpp
@@ -21,6 +21,7 @@ namespace {
 
 constexpr auto kSharedMediaLimit = 100;
 constexpr auto kFirstSharedMediaLimit = 0;
+constexpr auto kHistoryLimit = 50;
 constexpr auto kDefaultSearchTimeoutMs = crl::time(200);
 
 } // namespace
@@ -199,6 +200,60 @@ SearchResult ParseSearchResult(
 	return result;
 }
 
+HistoryRequest PrepareHistoryRequest(
+		not_null<PeerData*> peer,
+		MsgId messageId,
+		Data::LoadDirection direction) {
+	const auto minId = 0;
+	const auto maxId = 0;
+	const auto limit = kHistoryLimit;
+	const auto offsetId = [&] {
+		switch (direction) {
+		case Data::LoadDirection::Before:
+		case Data::LoadDirection::Around: return messageId;
+		case Data::LoadDirection::After: return messageId + 1;
+		}
+		Unexpected("Direction in PrepareSearchRequest");
+	}();
+	const auto addOffset = [&] {
+		switch (direction) {
+		case Data::LoadDirection::Before: return 0;
+		case Data::LoadDirection::Around: return -limit / 2;
+		case Data::LoadDirection::After: return -limit;
+		}
+		Unexpected("Direction in PrepareSearchRequest");
+	}();
+	const auto hash = uint64(0);
+	const auto offsetDate = int32(0);
+
+	const auto mtpOffsetId = int(std::clamp(
+		offsetId.bare,
+		int64(0),
+		int64(0x3FFFFFFF)));
+	return MTPmessages_GetHistory(
+		peer->input,
+		MTP_int(mtpOffsetId),
+		MTP_int(offsetDate),
+		MTP_int(addOffset),
+		MTP_int(limit),
+		MTP_int(maxId),
+		MTP_int(minId),
+		MTP_long(hash));
+}
+
+HistoryResult ParseHistoryResult(
+		not_null<PeerData*> peer,
+		MsgId messageId,
+		Data::LoadDirection direction,
+		const HistoryRequestResult &data) {
+	return ParseSearchResult(
+		peer,
+		Storage::SharedMediaType::kCount,
+		messageId,
+		direction,
+		data);
+}
+
 SearchController::CacheEntry::CacheEntry(
 	not_null<Main::Session*> session,
 	const Query &query)
diff --git a/Telegram/SourceFiles/data/data_search_controller.h b/Telegram/SourceFiles/data/data_search_controller.h
index a938df6ef65fe..26b930b9b718a 100644
--- a/Telegram/SourceFiles/data/data_search_controller.h
+++ b/Telegram/SourceFiles/data/data_search_controller.h
@@ -32,7 +32,11 @@ struct SearchResult {
 using SearchRequest = MTPmessages_Search;
 using SearchRequestResult = MTPmessages_Messages;
 
-std::optional<SearchRequest> PrepareSearchRequest(
+using HistoryResult = SearchResult;
+using HistoryRequest = MTPmessages_GetHistory;
+using HistoryRequestResult = MTPmessages_Messages;
+
+[[nodiscard]] std::optional<SearchRequest> PrepareSearchRequest(
 	not_null<PeerData*> peer,
 	MsgId topicRootId,
 	Storage::SharedMediaType type,
@@ -40,13 +44,24 @@ std::optional<SearchRequest> PrepareSearchRequest(
 	MsgId messageId,
 	Data::LoadDirection direction);
 
-SearchResult ParseSearchResult(
+[[nodiscard]] SearchResult ParseSearchResult(
 	not_null<PeerData*> peer,
 	Storage::SharedMediaType type,
 	MsgId messageId,
 	Data::LoadDirection direction,
 	const SearchRequestResult &data);
 
+[[nodiscard]] HistoryRequest PrepareHistoryRequest(
+	not_null<PeerData*> peer,
+	MsgId messageId,
+	Data::LoadDirection direction);
+
+[[nodiscard]] HistoryResult ParseHistoryResult(
+	not_null<PeerData*> peer,
+	MsgId messageId,
+	Data::LoadDirection direction,
+	const HistoryRequestResult &data);
+
 class SearchController final {
 public:
 	using IdsList = Storage::SparseIdsList;
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index dca53737d1ea2..3643ed726da81 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -41,6 +41,7 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "data/data_document.h"
 #include "data/data_histories.h"
+#include "data/data_history_messages.h"
 #include "lang/lang_keys.h"
 #include "apiwrap.h"
 #include "api/api_chat_participants.h"
@@ -483,7 +484,7 @@ not_null<HistoryItem*> History::insertItem(
 		std::unique_ptr<HistoryItem> item) {
 	Expects(item != nullptr);
 
-	const auto &[i, ok] = _messages.insert(std::move(item));
+	const auto &[i, ok] = _items.insert(std::move(item));
 
 	const auto result = i->get();
 	owner().registerMessage(result);
@@ -500,6 +501,9 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 		// All this must be done for all items manually in History::clear()!
 		item->destroyHistoryEntry();
 		if (item->isRegular()) {
+			if (const auto messages = _messages.get()) {
+				messages->removeOne(item->id);
+			}
 			if (const auto types = item->sharedMediaTypes()) {
 				session().storage().remove(Storage::SharedMediaRemoveOne(
 					peerId,
@@ -524,11 +528,11 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 	Core::App().notifications().clearFromItem(item);
 
 	auto hack = std::unique_ptr<HistoryItem>(item.get());
-	const auto i = _messages.find(hack);
+	const auto i = _items.find(hack);
 	hack.release();
 
-	Assert(i != end(_messages));
-	_messages.erase(i);
+	Assert(i != end(_items));
+	_items.erase(i);
 
 	if (documentToCancel) {
 		session().data().documentMessageRemoved(documentToCancel);
@@ -537,8 +541,8 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 
 void History::destroyMessagesByDates(TimeId minDate, TimeId maxDate) {
 	auto toDestroy = std::vector<not_null<HistoryItem*>>();
-	toDestroy.reserve(_messages.size());
-	for (const auto &message : _messages) {
+	toDestroy.reserve(_items.size());
+	for (const auto &message : _items) {
 		if (message->isRegular()
 			&& message->date() > minDate
 			&& message->date() < maxDate) {
@@ -552,8 +556,8 @@ void History::destroyMessagesByDates(TimeId minDate, TimeId maxDate) {
 
 void History::destroyMessagesByTopic(MsgId topicRootId) {
 	auto toDestroy = std::vector<not_null<HistoryItem*>>();
-	toDestroy.reserve(_messages.size());
-	for (const auto &message : _messages) {
+	toDestroy.reserve(_items.size());
+	for (const auto &message : _items) {
 		if (message->topicRootId() == topicRootId) {
 			toDestroy.push_back(message.get());
 		}
@@ -575,7 +579,7 @@ void History::unpinMessagesFor(MsgId topicRootId) {
 				topic->setHasPinnedMessages(false);
 			});
 		}
-		for (const auto &item : _messages) {
+		for (const auto &item : _items) {
 			if (item->isPinned()) {
 				item->setIsPinned(false);
 			}
@@ -589,7 +593,7 @@ void History::unpinMessagesFor(MsgId topicRootId) {
 		if (const auto topic = peer->forumTopicFor(topicRootId)) {
 			topic->setHasPinnedMessages(false);
 		}
-		for (const auto &item : _messages) {
+		for (const auto &item : _items) {
 			if (item->isPinned() && item->topicRootId() == topicRootId) {
 				item->setIsPinned(false);
 			}
@@ -781,9 +785,12 @@ not_null<HistoryItem*> History::addNewToBack(
 	addItemToBlock(item);
 
 	if (!unread && item->isRegular()) {
+		const auto from = loadedAtTop() ? 0 : minMsgId();
+		const auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId();
+		if (_messages) {
+			_messages->addExisting(item->id, { from, till });
+		}
 		if (const auto types = item->sharedMediaTypes()) {
-			auto from = loadedAtTop() ? 0 : minMsgId();
-			auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId();
 			auto &storage = session().storage();
 			storage.add(Storage::SharedMediaAddExisting(
 				peer->id,
@@ -1190,6 +1197,7 @@ void History::mainViewRemoved(
 
 void History::newItemAdded(not_null<HistoryItem*> item) {
 	item->indexAsNewItem();
+	item->addToMessagesIndex();
 	if (const auto from = item->from() ? item->from()->asUser() : nullptr) {
 		if (from == item->author()) {
 			_sendActionPainter.clear(from);
@@ -2385,6 +2393,9 @@ void History::setNotLoadedAtBottom() {
 
 	session().storage().invalidate(
 		Storage::SharedMediaInvalidateBottom(peer->id));
+	if (const auto messages = _messages.get()) {
+		messages->invalidateBottom();
+	}
 }
 
 void History::clearSharedMedia() {
@@ -3092,6 +3103,46 @@ MsgRange History::rangeForDifferenceRequest() const {
 	return MsgRange();
 }
 
+Data::HistoryMessages &History::messages() {
+	if (!_messages) {
+		_messages = std::make_unique<Data::HistoryMessages>();
+
+		const auto from = loadedAtTop() ? 0 : minMsgId();
+		const auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId();
+		auto list = std::vector<MsgId>();
+		list.reserve(std::min(
+			int(_items.size()),
+			int(blocks.size()) * kNewBlockEachMessage));
+		auto sort = false;
+		for (const auto &block : blocks) {
+			for (const auto &view : block->messages) {
+				const auto item = view->data();
+				if (item->isRegular()) {
+					const auto id = item->id;
+					if (!list.empty() && list.back() >= id) {
+						sort = true;
+					}
+				}
+			}
+		}
+		if (sort) {
+			ranges::sort(list);
+		}
+		if (till) {
+			_messages->addSlice(std::move(list), { from, till }, {});
+		}
+	}
+	return *_messages;
+}
+
+const Data::HistoryMessages &History::messages() const {
+	return const_cast<History*>(this)->messages();
+}
+
+Data::HistoryMessages *History::maybeMessages() {
+	return _messages.get();
+}
+
 HistoryItem *History::insertJoinedMessage() {
 	const auto channel = peer->asChannel();
 	if (!channel
@@ -3194,11 +3245,11 @@ void History::removeJoinedMessage() {
 
 void History::reactionsEnabledChanged(bool enabled) {
 	if (!enabled) {
-		for (const auto &item : _messages) {
+		for (const auto &item : _items) {
 			item->updateReactions(nullptr);
 		}
 	} else {
-		for (const auto &item : _messages) {
+		for (const auto &item : _items) {
 			item->updateReactionsUnknown();
 		}
 	}
@@ -3372,6 +3423,9 @@ void History::clear(ClearType type) {
 		}
 		_loadedAtTop = _loadedAtBottom = _lastMessage.has_value();
 		clearSharedMedia();
+		if (const auto messages = _messages.get()) {
+			messages->removeAll();
+		}
 		clearLastKeyboard();
 	}
 
@@ -3388,8 +3442,8 @@ void History::clear(ClearType type) {
 
 void History::clearUpTill(MsgId availableMinId) {
 	auto remove = std::vector<not_null<HistoryItem*>>();
-	remove.reserve(_messages.size());
-	for (const auto &item : _messages) {
+	remove.reserve(_items.size());
+	for (const auto &item : _items) {
 		const auto itemId = item->id;
 		if (!item->isRegular()) {
 			continue;
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index e00c23b8d1eeb..729b66045cbe5 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -26,12 +26,14 @@ class HistoryMainElementDelegateMixin;
 struct LanguageId;
 
 namespace Data {
+
 struct Draft;
 class Session;
 class Folder;
 class ChatFilter;
 struct SponsoredFrom;
 class SponsoredMessages;
+class HistoryMessages;
 
 enum class ForwardOptions {
 	PreserveInfo,
@@ -79,7 +81,7 @@ class History final : public Data::Thread {
 	History(not_null<Data::Session*> owner, PeerId peerId);
 	~History();
 
-	not_null<History*> owningHistory() override {
+	[[nodiscard]] not_null<History*> owningHistory() override {
 		return this;
 	}
 	[[nodiscard]] Data::Thread *threadFor(MsgId topicRootId);
@@ -93,23 +95,27 @@ class History final : public Data::Thread {
 	void forumChanged(Data::Forum *old);
 	[[nodiscard]] bool isForum() const;
 
-	not_null<History*> migrateToOrMe() const;
-	History *migrateFrom() const;
-	MsgRange rangeForDifferenceRequest() const;
+	[[nodiscard]] not_null<History*> migrateToOrMe() const;
+	[[nodiscard]] History *migrateFrom() const;
+	[[nodiscard]] MsgRange rangeForDifferenceRequest() const;
+
+	[[nodiscard]] Data::HistoryMessages &messages();
+	[[nodiscard]] const Data::HistoryMessages &messages() const;
+	[[nodiscard]] Data::HistoryMessages *maybeMessages();
 
-	HistoryItem *joinedMessageInstance() const;
+	[[nodiscard]] HistoryItem *joinedMessageInstance() const;
 	void checkLocalMessages();
 	void removeJoinedMessage();
 
 	void reactionsEnabledChanged(bool enabled);
 
-	bool isEmpty() const;
-	bool isDisplayedEmpty() const;
-	Element *findFirstNonEmpty() const;
-	Element *findFirstDisplayed() const;
-	Element *findLastNonEmpty() const;
-	Element *findLastDisplayed() const;
-	bool hasOrphanMediaGroupPart() const;
+	[[nodiscard]] bool isEmpty() const;
+	[[nodiscard]] bool isDisplayedEmpty() const;
+	[[nodiscard]] Element *findFirstNonEmpty() const;
+	[[nodiscard]] Element *findFirstDisplayed() const;
+	[[nodiscard]] Element *findLastNonEmpty() const;
+	[[nodiscard]] Element *findLastDisplayed() const;
+	[[nodiscard]] bool hasOrphanMediaGroupPart() const;
 	[[nodiscard]] std::vector<MsgId> collectMessagesFromParticipantToDelete(
 		not_null<PeerData*> participant) const;
 
@@ -590,7 +596,9 @@ class History final : public Data::Thread {
 	std::optional<HistoryItem*> _lastMessage;
 	std::optional<HistoryItem*> _lastServerMessage;
 	base::flat_set<not_null<HistoryItem*>> _clientSideMessages;
-	std::unordered_set<std::unique_ptr<HistoryItem>> _messages;
+	std::unordered_set<std::unique_ptr<HistoryItem>> _items;
+
+	std::unique_ptr<Data::HistoryMessages> _messages;
 
 	// This almost always is equal to _lastMessage. The only difference is
 	// for a group that migrated to a supergroup. Then _lastMessage can
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index cdc57d00def68..53ba1c67c4b32 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -55,6 +55,7 @@ For license and copyright information please follow this link:
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_game.h"
+#include "data/data_history_messages.h"
 #include "data/data_user.h"
 #include "data/data_group_call.h" // Data::GroupCall::id().
 #include "data/data_poll.h" // PollData::publicVotes.
@@ -1791,6 +1792,7 @@ void HistoryItem::applySentMessage(const MTPDmessage &data) {
 	setIsPinned(data.is_pinned());
 	contributeToSlowmode(data.vdate().v);
 	addToSharedMediaIndex();
+	addToMessagesIndex();
 	invalidateChatListEntry();
 	if (const auto period = data.vttl_period(); period && period->v > 0) {
 		applyTTL(data.vdate().v + period->v);
@@ -1815,6 +1817,7 @@ void HistoryItem::applySentMessage(
 	contributeToSlowmode(data.vdate().v);
 	if (!wasAlready) {
 		addToSharedMediaIndex();
+		addToMessagesIndex();
 	}
 	invalidateChatListEntry();
 	if (const auto period = data.vttl_period(); period && period->v > 0) {
@@ -2011,6 +2014,14 @@ void HistoryItem::removeFromSharedMediaIndex() {
 	}
 }
 
+void HistoryItem::addToMessagesIndex() {
+	if (isRegular()) {
+		if (const auto messages = _history->maybeMessages()) {
+			messages->addNew(id);
+		}
+	}
+}
+
 void HistoryItem::incrementReplyToTopCounter() {
 	if (isRegular() && _history->peer->isMegagroup()) {
 		_history->session().changes().messageUpdated(
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index c8963b707c173..c7d3e59aae2ac 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -359,6 +359,7 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 
 	void indexAsNewItem();
 	void addToSharedMediaIndex();
+	void addToMessagesIndex();
 	void removeFromSharedMediaIndex();
 
 	struct NotificationTextOptions {
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index c394af68bbc64..caca93da10bea 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_chat_preview.h"
 
 #include "data/data_forum_topic.h"
+#include "data/data_history_messages.h"
 #include "data/data_peer.h"
 #include "data/data_replies_list.h"
 #include "data/data_thread.h"
@@ -15,6 +16,7 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_list_widget.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
@@ -136,6 +138,7 @@ class Item final
 	const not_null<QAction*> _dummyAction;
 	const not_null<Main::Session*> _session;
 	const not_null<Data::Thread*> _thread;
+	const std::shared_ptr<Data::RepliesList> _replies;
 	const not_null<History*> _history;
 	const not_null<PeerData*> _peer;
 	const std::shared_ptr<Ui::ChatTheme> _theme;
@@ -153,6 +156,7 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 , _dummyAction(new QAction(parent))
 , _session(&thread->session())
 , _thread(thread)
+, _replies(thread->asTopic() ? thread->asTopic()->replies() : nullptr)
 , _history(thread->owningHistory())
 , _peer(thread->peer())
 , _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
@@ -253,52 +257,13 @@ rpl::producer<Data::MessagesSlice> Item::listSource(
 		Data::MessagePosition aroundId,
 		int limitBefore,
 		int limitAfter) {
-	if (const auto topic = _thread->asTopic()) {
-		return topic->replies()->source(
+	return _replies
+		? _replies->source(aroundId, limitBefore, limitAfter)
+		: Data::HistoryMessagesViewer(
+			_thread->asHistory(),
 			aroundId,
 			limitBefore,
-			limitAfter
-		) | rpl::before_next([=] { // after_next makes a copy of value.
-			//if (!_loaded) {
-			//	_loaded = true;
-			//	crl::on_main(this, [=] {
-			//		updatePinnedVisibility();
-			//	});
-			//}
-		});
-	}
-	// #TODO
-	//const auto messageId = aroundId.fullId.msg
-	//	? aroundId.fullId.msg
-	//	: (ServerMaxMsgId - 1);
-
-	//return SharedMediaMergedViewer(
-	//	&_thread->session(),
-	//	SharedMediaMergedKey(
-	//		SparseIdsMergedSlice::Key(
-	//			_history->peer->id,
-	//			_thread->topicRootId(),
-	//			_migratedPeer ? _migratedPeer->id : 0,
-	//			messageId),
-	//		Storage::SharedMediaType::Pinned),
-	//	limitBefore,
-	//	limitAfter
-	//) | rpl::map([=](SparseIdsMergedSlice &&slice) {
-	//	auto result = Data::MessagesSlice();
-	//	result.fullCount = slice.fullCount();
-	//	result.skippedAfter = slice.skippedAfter();
-	//	result.skippedBefore = slice.skippedBefore();
-	//	const auto count = slice.size();
-	//	result.ids.reserve(count);
-	//	if (const auto msgId = slice.nearest(messageId)) {
-	//		result.nearestToAround = *msgId;
-	//	}
-	//	for (auto i = 0; i != count; ++i) {
-	//		result.ids.push_back(slice[i]);
-	//	}
-	//	return result;
-	//});
-	return rpl::single(Data::MessagesSlice());
+			limitAfter);
 }
 
 bool Item::listAllowsMultiSelect() {
@@ -341,7 +306,44 @@ void Item::listMarkContentsRead(
 
 MessagesBarData Item::listMessagesBar(
 		const std::vector<not_null<Element*>> &elements) {
-	return {};// #TODO
+	if (elements.empty()) {
+		return {};
+	} else if (!_replies && !_history->unreadCount()) {
+		return {};
+	}
+	const auto repliesTill = _replies
+		? _replies->computeInboxReadTillFull()
+		: MsgId();
+	const auto migrated = _replies ? nullptr : _history->migrateFrom();
+	const auto migratedTill = migrated ? migrated->inboxReadTillId() : 0;
+	const auto historyTill = _replies ? 0 : _history->inboxReadTillId();
+	if (!_replies && !migratedTill && !historyTill) {
+		return {};
+	}
+
+	const auto hidden = _replies && (repliesTill < 2);
+	for (auto i = 0, count = int(elements.size()); i != count; ++i) {
+		const auto item = elements[i]->data();
+		if (!item->isRegular()
+			|| item->out()
+			|| (_replies && !item->replyToId())) {
+			continue;
+		}
+		const auto inHistory = (item->history() == _history);
+		if ((_replies && item->id > repliesTill)
+			|| (migratedTill && (inHistory || item->id > migratedTill))
+			|| (historyTill && inHistory && item->id > historyTill)) {
+			return {
+				.bar = {
+					.element = elements[i],
+					.hidden = hidden,
+					.focus = true,
+				},
+				.text = tr::lng_unread_bar_some(),
+			};
+		}
+	}
+	return {};
 }
 
 void Item::listContentRefreshed() {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 5386063392588..bdcf93a03e58f 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -939,7 +939,9 @@ void ListWidget::restoreScrollState() {
 		}
 		_scrollInited = true;
 		_scrollTopState.item = _bar.element->data()->position();
-		_scrollTopState.shift = st::lineWidth + st::historyUnreadBarMargin;
+		_scrollTopState.shift = st::lineWidth
+			+ st::historyUnreadBarMargin
+			+ _bar.element->displayedDateHeight();
 	}
 	const auto index = findNearestItem(_scrollTopState.item);
 	if (index >= 0) {
diff --git a/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp b/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
index c3845ddcacb4e..33ea5ec5cc795 100644
--- a/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
+++ b/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
@@ -187,20 +187,9 @@ void SparseIdsList::invalidateBottom() {
 rpl::producer<SparseIdsListResult> SparseIdsList::query(
 		SparseIdsListQuery &&query) const {
 	return [this, query = std::move(query)](auto consumer) {
-		auto slice = query.aroundId
-			? ranges::lower_bound(
-				_slices,
-				query.aroundId,
-				std::less<>(),
-				[](const Slice &slice) { return slice.range.till; })
-			: _slices.end();
-		if (slice != _slices.end()
-			&& slice->range.from <= query.aroundId) {
-			consumer.put_next(queryFromSlice(query, *slice));
-		} else if (_count) {
-			auto result = SparseIdsListResult {};
-			result.count = _count;
-			consumer.put_next(std::move(result));
+		auto now = snapshot(query);
+		if (!now.messageIds.empty() || now.count) {
+			consumer.put_next(std::move(now));
 		}
 		consumer.put_done();
 		return rpl::lifetime();
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 5c2cbf99db291..36e3b59470c1f 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1086,4 +1086,7 @@ previewMenu: PopupMenu(defaultPopupMenu) {
 	maxHeight: 420px;
 	radius: boxRadius;
 	shadow: boxRoundShadow;
+	animation: PanelAnimation(defaultPanelAnimation) {
+		shadow: boxRoundShadow;
+	}
 }

From 0f524ac67da173c038be12a76af957b94fec599d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 16:27:43 +0400
Subject: [PATCH 146/400] Don't stick to bottom while loading down.

---
 .../SourceFiles/history/view/history_view_list_widget.cpp   | 6 ++++--
 .../SourceFiles/history/view/history_view_list_widget.h     | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index bdcf93a03e58f..e951cd802f172 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -589,6 +589,7 @@ void ListWidget::refreshRows(const Data::MessagesSlice &old) {
 
 	auto destroyingBarElement = _bar.element;
 	auto clearingOverElement = _overElement;
+	_itemsKnownTillEnd = (_slice.skippedAfter == 0);
 	_resizePending = true;
 	_items.clear();
 	_items.reserve(_slice.ids.size());
@@ -1107,7 +1108,7 @@ void ListWidget::applyUpdatedScrollState() {
 }
 
 void ListWidget::updateVisibleTopItem() {
-	if (_visibleBottom == height()) {
+	if (_itemsKnownTillEnd && _visibleBottom == height()) {
 		_visibleTopItem = nullptr;
 	} else if (_items.empty()) {
 		_visibleTopItem = nullptr;
@@ -2558,7 +2559,8 @@ Element *ListWidget::strictFindItemByY(int y) const {
 }
 
 auto ListWidget::countScrollState() const -> ScrollTopState {
-	if (_items.empty() || _visibleBottom == height()) {
+	if (_items.empty()
+		|| (_itemsKnownTillEnd && _visibleBottom == height())) {
 		return { Data::MessagePosition(), 0 };
 	}
 	const auto topItem = findItemByY(_visibleTop);
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index f885827229e6e..bd8ad7827a84d 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -727,6 +727,8 @@ class ListWidget final
 	int _aroundIndex = -1;
 	int _idsLimit = kMinimalIdsLimit;
 	Data::MessagesSlice _slice;
+	bool _itemsKnownTillEnd = false;
+
 	std::vector<not_null<Element*>> _items;
 	ViewsMap _views, _viewsCapacity;
 	int _itemsTop = 0;

From aee62c7591e530c69b386b41b738a63bddbdc5cd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 18:28:52 +0400
Subject: [PATCH 147/400] Fix migrated history in chat preview.

---
 Telegram/SourceFiles/data/data_history_messages.cpp | 2 +-
 Telegram/SourceFiles/history/history.cpp            | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_history_messages.cpp b/Telegram/SourceFiles/data/data_history_messages.cpp
index 7c29daf9e2f1a..86b46503d827f 100644
--- a/Telegram/SourceFiles/data/data_history_messages.cpp
+++ b/Telegram/SourceFiles/data/data_history_messages.cpp
@@ -151,7 +151,7 @@ rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
 		const auto chosen = (history->peer->id == peerId)
 			? history
 			: history->owner().history(peerId);
-		return HistoryViewer(history, simpleKey, limitBefore, limitAfter);
+		return HistoryViewer(chosen, simpleKey, limitBefore, limitAfter);
 	};
 	const auto peerId = history->peer->id;
 	const auto topicRootId = MsgId();
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 3643ed726da81..02a3324b9f8ca 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -3107,8 +3107,9 @@ Data::HistoryMessages &History::messages() {
 	if (!_messages) {
 		_messages = std::make_unique<Data::HistoryMessages>();
 
+		const auto max = maxMsgId();
 		const auto from = loadedAtTop() ? 0 : minMsgId();
-		const auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId();
+		const auto till = loadedAtBottom() ? ServerMaxMsgId : max;
 		auto list = std::vector<MsgId>();
 		list.reserve(std::min(
 			int(_items.size()),
@@ -3122,13 +3123,14 @@ Data::HistoryMessages &History::messages() {
 					if (!list.empty() && list.back() >= id) {
 						sort = true;
 					}
+					list.push_back(id);
 				}
 			}
 		}
 		if (sort) {
 			ranges::sort(list);
 		}
-		if (till) {
+		if (max || (loadedAtTop() && loadedAtBottom())) {
 			_messages->addSlice(std::move(list), { from, till }, {});
 		}
 	}

From cd7cfcdf2fa1e566abe5c6e79379a2a07a384df4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 18:30:14 +0400
Subject: [PATCH 148/400] Show chat preview on Alt+Click.

---
 .../dialogs/dialogs_inner_widget.cpp          | 30 ++++++++++++-------
 .../dialogs/dialogs_inner_widget.h            |  4 +--
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index fbf6eb5133df0..6aef6c8a70b8f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -159,7 +159,7 @@ InnerWidget::InnerWidget(
 	+ st::defaultDialogRow.padding.left())
 , _cancelSearchInChat(this, st::dialogsCancelSearchInPeer)
 , _cancelSearchFromUser(this, st::dialogsCancelSearchInPeer)
-, _chatPreviewTimer([=] { showChatPreview(); })
+, _chatPreviewTimer([=] { showChatPreview(true); })
 , _childListShown(std::move(childListShown)) {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 
@@ -1435,6 +1435,18 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	setFilteredPressed(_filteredSelected, _selectedTopicJump);
 	setPeerSearchPressed(_peerSearchSelected);
 	setSearchedPressed(_searchedSelected);
+
+	const auto alt = (e->modifiers() & Qt::AltModifier);
+	const auto onlyUserpic = !alt;
+	if (pressShowsPreview(onlyUserpic)) {
+		_chatPreviewWillBeFor = computeChosenRow().key;
+		if (alt) {
+			showChatPreview(onlyUserpic);
+			return;
+		}
+		_chatPreviewTimer.callOnce(kChatPreviewDelay);
+	}
+
 	if (base::in_range(_collapsedSelected, 0, _collapsedRows.size())) {
 		auto row = &_collapsedRows[_collapsedSelected]->row;
 		row->addRipple(e->pos(), QSize(width(), st::dialogsImportantBarHeight), [this, index = _collapsedSelected] {
@@ -1503,10 +1515,8 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 			row->repaint());
 	}
 	ClickHandler::pressed();
-	if (pressShowsPreview()) {
-		_chatPreviewWillBeFor = computeChosenRow().key;
-		_chatPreviewTimer.callOnce(kChatPreviewDelay);
-	} else if (anim::Disabled()
+	if (anim::Disabled()
+		&& !_chatPreviewTimer.isActive()
 		&& (!_pressed || !_pressed->entry()->isPinnedDialog(_filterId))) {
 		mousePressReleased(e->globalPos(), e->button(), e->modifiers());
 	}
@@ -2306,10 +2316,10 @@ void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 	});
 }
 
-void InnerWidget::showChatPreview() {
+void InnerWidget::showChatPreview(bool onlyUserpic) {
 	const auto key = base::take(_chatPreviewWillBeFor);
 	cancelChatPreview();
-	if (!pressShowsPreview() || key != computeChosenRow().key) {
+	if (!pressShowsPreview(onlyUserpic) || key != computeChosenRow().key) {
 		return;
 	}
 	ClickHandler::unpressed();
@@ -3558,15 +3568,15 @@ bool InnerWidget::isUserpicPress() const {
 		&& (width() > _narrowWidth);
 }
 
-bool InnerWidget::pressShowsPreview() const {
-	if (!isUserpicPress()) {
+bool InnerWidget::pressShowsPreview(bool onlyUserpic) const {
+	if (onlyUserpic && !isUserpicPress()) {
 		return false;
 	}
 	const auto key = computeChosenRow().key;
 	if (const auto history = key.history()) {
 		return !history->peer->isForum();
 	}
-	return key.topic() != nullptr;;
+	return key.topic() != nullptr;
 }
 
 bool InnerWidget::chooseRow(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index c8186e2eac7ac..fe9a3d926ee67 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -123,9 +123,9 @@ class InnerWidget final : public Ui::RpWidget {
 	void resizeEmptyLabel();
 
 	[[nodiscard]] bool isUserpicPress() const;
-	[[nodiscard]] bool pressShowsPreview() const;
+	[[nodiscard]] bool pressShowsPreview(bool onlyUserpic) const;
 	void cancelChatPreview();
-	void showChatPreview();
+	void showChatPreview(bool onlyUserpic);
 	bool chooseRow(
 		Qt::KeyboardModifiers modifiers = {},
 		MsgId pressedTopicRootId = {});

From de73d8766c764d2cf5e64d269a53705749649708 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 May 2024 21:10:14 +0400
Subject: [PATCH 149/400] Open chat on exact clicked message from preview.

---
 .../dialogs/dialogs_inner_widget.cpp          | 28 ++++++++++-
 .../view/history_view_chat_preview.cpp        | 49 ++++++++++++++-----
 .../history/view/history_view_chat_preview.h  | 12 ++++-
 .../history/view/history_view_list_widget.cpp |  4 ++
 .../history/view/history_view_list_widget.h   |  1 +
 5 files changed, 80 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 6aef6c8a70b8f..d3c772c31b24a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -2326,10 +2326,34 @@ void InnerWidget::showChatPreview(bool onlyUserpic) {
 	mousePressReleased(QCursor::pos(), Qt::NoButton, Qt::NoModifier);
 
 	_chatPreviewKey = key;
-	_menu = HistoryView::MakeChatPreview(this, key.entry());
-	if (!_menu) {
+	auto preview = HistoryView::MakeChatPreview(this, key.entry());
+	if (!preview.menu) {
 		return;
 	}
+	_menu = std::move(preview.menu);
+	const auto weakMenu = Ui::MakeWeak(_menu.get());
+	const auto weakThread = base::make_weak(key.entry()->asThread());
+	const auto weakController = base::make_weak(_controller);
+	std::move(
+		preview.actions
+	) | rpl::start_with_next([=](HistoryView::ChatPreviewAction action) {
+		if (const auto controller = weakController.get()) {
+			if (const auto thread = weakThread.get()) {
+				const auto itemId = action.openItemId;
+				const auto owner = &thread->owner();
+				if (action.openInfo) {
+					controller->showPeerInfo(thread);
+				} else if (const auto item = owner->message(itemId)) {
+					controller->showMessage(item);
+				} else {
+					controller->showThread(thread);
+				}
+			}
+		}
+		if (const auto strong = weakMenu.data()) {
+			strong->hideMenu();
+		}
+	}, _menu->lifetime());
 	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
 		if (_chatPreviewKey) {
 			updateDialogRow(RowDescriptor(base::take(_chatPreviewKey), {}));
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index caca93da10bea..48b15494a88c6 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -25,6 +25,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/menu/menu_item_base.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
+#include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -36,8 +37,12 @@ class Item final
 public:
 	Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread);
 
-	not_null<QAction*> action() const override;
-	bool isEnabled() const override;
+	[[nodiscard]] not_null<QAction*> action() const override;
+	[[nodiscard]] bool isEnabled() const override;
+
+	[[nodiscard]] rpl::producer<ChatPreviewAction> actions() {
+		return _actions.events();
+	}
 
 private:
 	int contentHeight() const override;
@@ -146,6 +151,7 @@ class Item final
 	const std::unique_ptr<Ui::ElasticScroll> _scroll;
 
 	QPointer<HistoryView::ListWidget> _inner;
+	rpl::event_stream<ChatPreviewAction> _actions;
 
 	QImage _bg;
 
@@ -180,6 +186,22 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 	using Type = Ui::ElasticScroll::OverscrollType;
 	_scroll->setOverscrollTypes(Type::Real, Type::Real);
 
+	_scroll->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			const auto relative = Ui::MapFrom(
+				_inner.data(),
+				_scroll.get(),
+				static_cast<QMouseEvent*>(e.get())->pos());
+			if (const auto view = _inner->lookupItemByY(relative.y())) {
+				_actions.fire(ChatPreviewAction{
+					.openItemId = view->data()->fullId(),
+				});
+			} else {
+				_actions.fire(ChatPreviewAction{});
+			}
+		}
+	}, lifetime());
+
 	_inner->resizeToWidth(_scroll->width(), _scroll->height());
 
 	_inner->refreshViewer();
@@ -519,31 +541,36 @@ void Item::listLaunchDrag(
 
 } // namespace
 
-base::unique_qptr<Ui::PopupMenu> MakeChatPreview(
+ChatPreview MakeChatPreview(
 		QWidget *parent,
 		not_null<Dialogs::Entry*> entry) {
 	const auto thread = entry->asThread();
 	if (!thread) {
-		return nullptr;
+		return {};
 	} else if (const auto history = entry->asHistory()) {
 		if (history->peer->isForum()) {
-			return nullptr;
+			return {};
 		}
 	}
 
-	auto result = base::make_unique_q<Ui::PopupMenu>(
-		parent,
-		st::previewMenu);
+	auto result = ChatPreview{
+		.menu = base::make_unique_q<Ui::PopupMenu>(
+			parent,
+			st::previewMenu),
+	};
+	const auto menu = result.menu.get();
 
-	result->addAction(base::make_unique_q<Item>(result.get(), thread));
+	auto action = base::make_unique_q<Item>(menu, thread);
+	result.actions = action->actions();
+	menu->addAction(std::move(action));
 	if (const auto topic = thread->asTopic()) {
-		const auto weak = Ui::MakeWeak(result.get());
+		const auto weak = Ui::MakeWeak(menu);
 		topic->destroyed() | rpl::start_with_next([weak] {
 			if (const auto strong = weak.data()) {
 				LOG(("Preview hidden for a destroyed topic."));
 				strong->hideMenu(true);
 			}
-		}, result->lifetime());
+		}, menu->lifetime());
 	}
 
 	return result;
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.h b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
index 12a35bbba9823..9445b61718dbc 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.h
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
@@ -19,7 +19,17 @@ class PopupMenu;
 
 namespace HistoryView {
 
-[[nodiscard]] base::unique_qptr<Ui::PopupMenu> MakeChatPreview(
+struct ChatPreviewAction {
+	FullMsgId openItemId;
+	bool openInfo = false;
+};
+
+struct ChatPreview {
+	base::unique_qptr<Ui::PopupMenu> menu;
+	rpl::producer<ChatPreviewAction> actions;
+};
+
+[[nodiscard]] ChatPreview MakeChatPreview(
 	QWidget *parent,
 	not_null<Dialogs::Entry*> entry);
 
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index e951cd802f172..a320a67f78b43 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1584,6 +1584,10 @@ bool ListWidget::hasSelectRestriction() const {
 		!= CopyRestrictionType::None;
 }
 
+Element *ListWidget::lookupItemByY(int y) const {
+	return strictFindItemByY(y);
+}
+
 auto ListWidget::findViewForPinnedTracking(int top) const
 -> std::pair<Element*, int> {
 	const auto findScrollTopItem = [&](int top)
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index bd8ad7827a84d..e5304bb446d9b 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -344,6 +344,7 @@ class ListWidget final
 	[[nodiscard]] bool hasCopyRestrictionForSelected() const;
 	[[nodiscard]] bool showCopyRestrictionForSelected();
 	[[nodiscard]] bool hasSelectRestriction() const;
+	[[nodiscard]] Element *lookupItemByY(int y) const;
 
 	[[nodiscard]] std::pair<Element*, int> findViewForPinnedTracking(
 		int top) const;

From a60783eae3016ea105d242a0a136e9c2eca1cb87 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 4 May 2024 11:37:07 +0400
Subject: [PATCH 150/400] Implement preview top and bottom.

---
 .../dialogs/dialogs_inner_widget.cpp          |  10 +-
 .../view/history_view_chat_preview.cpp        | 279 +++++++++++++++---
 .../history/view/history_view_chat_preview.h  |   2 +
 .../info/profile/info_profile_cover.cpp       |  15 +-
 .../info/profile/info_profile_cover.h         |   4 +
 Telegram/SourceFiles/ui/chat/chat.style       |  22 ++
 6 files changed, 289 insertions(+), 43 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index d3c772c31b24a..e76b137ec9137 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -2341,7 +2341,15 @@ void InnerWidget::showChatPreview(bool onlyUserpic) {
 			if (const auto thread = weakThread.get()) {
 				const auto itemId = action.openItemId;
 				const auto owner = &thread->owner();
-				if (action.openInfo) {
+				if (action.markRead) {
+					Window::MarkAsReadThread(thread);
+				} else if (action.markUnread) {
+					if (const auto history = thread->asHistory()) {
+						history->owner().histories().changeDialogUnreadMark(
+							history,
+							true);
+					}
+				} else if (action.openInfo) {
 					controller->showPeerInfo(thread);
 				} else if (const auto item = owner->message(itemId)) {
 					controller->showMessage(item);
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 48b15494a88c6..e1316a9eb4ac2 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -7,26 +7,39 @@ For license and copyright information please follow this link:
 */
 #include "history/view/history_view_chat_preview.h"
 
+#include "base/unixtime.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_forum_topic.h"
 #include "data/data_history_messages.h"
 #include "data/data_peer.h"
+#include "data/data_peer_values.h"
 #include "data/data_replies_list.h"
+#include "data/data_session.h"
 #include "data/data_thread.h"
 #include "history/view/reactions/history_view_reactions_button.h"
 #include "history/view/history_view_list_widget.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "info/profile/info_profile_cover.h"
+#include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/widgets/elastic_scroll.h"
+#include "ui/controls/userpic_button.h"
 #include "ui/widgets/menu/menu_item_base.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/elastic_scroll.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace HistoryView {
 namespace {
@@ -48,7 +61,10 @@ class Item final
 	int contentHeight() const override;
 	void paintEvent(QPaintEvent *e) override;
 
+	void setupTop();
+	void setupMarkRead();
 	void setupBackground();
+	void setupHistory();
 	void updateInnerVisibleArea();
 
 	Context listContext() override;
@@ -148,7 +164,9 @@ class Item final
 	const not_null<PeerData*> _peer;
 	const std::shared_ptr<Ui::ChatTheme> _theme;
 	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
+	const std::unique_ptr<Ui::AbstractButton> _top;
 	const std::unique_ptr<Ui::ElasticScroll> _scroll;
+	const std::unique_ptr<Ui::FlatButton> _markRead;
 
 	QPointer<HistoryView::ListWidget> _inner;
 	rpl::event_stream<ChatPreviewAction> _actions;
@@ -157,6 +175,56 @@ class Item final
 
 };
 
+struct StatusFields {
+	QString text;
+	bool active = false;
+};
+
+[[nodiscard]] rpl::producer<StatusFields> StatusValue(
+		not_null<PeerData*> peer) {
+	peer->updateFull();
+
+	using UpdateFlag = Data::PeerUpdate::Flag;
+	return peer->session().changes().peerFlagsValue(
+		peer,
+		UpdateFlag::OnlineStatus | UpdateFlag::Members
+	) | rpl::map([=](const Data::PeerUpdate &update)
+	-> StatusFields {
+		const auto wrap = [](QString text) {
+			return StatusFields{ .text = text };
+		};
+		if (const auto user = peer->asUser()) {
+			const auto now = base::unixtime::now();
+			return {
+				.text = Data::OnlineText(user, now),
+				.active = Data::OnlineTextActive(user, now),
+			};
+		} else if (const auto chat = peer->asChat()) {
+			return wrap(!chat->amIn()
+				? tr::lng_chat_status_unaccessible(tr::now)
+				: (chat->count <= 0)
+				? tr::lng_group_status(tr::now)
+				: tr::lng_chat_status_members(
+					tr::now,
+					lt_count_decimal,
+					chat->count));
+		} else if (const auto channel = peer->asChannel()) {
+			return wrap((channel->membersCount() > 0)
+				? ((channel->isMegagroup()
+					? tr::lng_chat_status_members
+					: tr::lng_chat_status_subscribers)(
+						tr::now,
+						lt_count_decimal,
+						channel->membersCount()))
+				: (channel->isMegagroup()
+					? tr::lng_group_status(tr::now)
+					: tr::lng_channel_status(tr::now)));
+		}
+		Unexpected("Peer type in ChatPreview Item.");
+	});
+
+}
+
 Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 : Ui::Menu::ItemBase(parent, st::previewMenu.menu)
 , _dummyAction(new QAction(parent))
@@ -167,17 +235,187 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 , _peer(thread->peer())
 , _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
 , _chatStyle(std::make_unique<Ui::ChatStyle>(_session->colorIndicesValue()))
-, _scroll(std::make_unique<Ui::ElasticScroll>(this)) {
+, _top(std::make_unique<Ui::AbstractButton>(this))
+, _scroll(std::make_unique<Ui::ElasticScroll>(this))
+, _markRead(
+	std::make_unique<Ui::FlatButton>(
+		this,
+		tr::lng_context_mark_read(tr::now),
+		st::previewMarkRead)) {
 	setPointerCursor(false);
 	setMinWidth(st::previewMenu.menu.widthMin);
 	resize(minWidth(), contentHeight());
+	setupTop();
+	setupMarkRead();
 	setupBackground();
+	setupHistory();
+}
+
+not_null<QAction*> Item::action() const {
+	return _dummyAction;
+}
 
+bool Item::isEnabled() const {
+	return false;
+}
+
+int Item::contentHeight() const {
+	return st::previewMenu.maxHeight;
+}
+
+void Item::setupTop() {
+	_top->setGeometry(0, 0, width(), st::previewTop.height);
+	_top->setClickedCallback([=] {
+		_actions.fire({ .openInfo = true });
+	});
+	_top->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		const auto &st = st::previewTop;
+		auto p = QPainter(_top.get());
+		p.fillRect(clip, st::topBarBg);
+	}, _top->lifetime());
+
+	const auto topic = _thread->asTopic();
+	const auto name = Ui::CreateChild<Ui::FlatLabel>(
+		_top.get(),
+		(topic
+			? Info::Profile::TitleValue(topic)
+			: Info::Profile::NameValue(_thread->peer())),
+		st::previewName);
+	name->setAttribute(Qt::WA_TransparentForMouseEvents);
+	auto statusFields = StatusValue(
+		_thread->peer()
+	) | rpl::start_spawning(lifetime());
+	auto statusText = rpl::duplicate(
+		statusFields
+	) | rpl::map([](StatusFields &&fields) {
+		return fields.text;
+	});
+	const auto status = Ui::CreateChild<Ui::FlatLabel>(
+		_top.get(),
+		(topic
+			? Info::Profile::NameValue(topic->channel())
+			: std::move(statusText)),
+		st::previewStatus);
+	std::move(statusFields) | rpl::start_with_next([=](const StatusFields &fields) {
+		status->setTextColorOverride(fields.active
+			? st::windowActiveTextFg->c
+			: std::optional<QColor>());
+	}, status->lifetime());
+	status->setAttribute(Qt::WA_TransparentForMouseEvents);
+	const auto userpic = topic
+		? nullptr
+		: Ui::CreateChild<Ui::UserpicButton>(
+			_top.get(),
+			_thread->peer(),
+			st::previewUserpic);
+	if (userpic) {
+		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+	const auto icon = topic
+		? Ui::CreateChild<Info::Profile::TopicIconButton>(
+			this,
+			topic,
+			[=] { return false; })
+		: nullptr;
+	if (icon) {
+		icon->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+
+	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
+	_top->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+		const auto &st = st::previewTop;
+		name->resizeToWidth(geometry.width()
+			- st.namePosition.x()
+			- st.photoPosition.x());
+		name->move(st::previewTop.namePosition);
+		status->resizeToWidth(geometry.width()
+			- st.statusPosition.x()
+			- st.photoPosition.x());
+		status->move(st.statusPosition);
+		shadow->setGeometry(
+			geometry.x(),
+			geometry.y() + geometry.height(),
+			geometry.width(),
+			st::lineWidth);
+		if (userpic) {
+			userpic->move(st.photoPosition);
+		} else {
+			icon->move(
+				st.photoPosition.x() + (st.photoSize - icon->width()) / 2,
+				st.photoPosition.y() + (st.photoSize - icon->height()) / 2);
+		}
+	}, shadow->lifetime());
+}
+
+void Item::setupMarkRead() {
+	_markRead->resizeToWidth(width());
+	_markRead->move(0, height() - _markRead->height());
+
+	rpl::single(
+		rpl::empty
+	) | rpl::then(
+		_thread->owner().chatsListFor(_thread)->unreadStateChanges(
+		) | rpl::to_empty
+	) | rpl::start_with_next([=] {
+		const auto state = _thread->chatListBadgesState();
+		const auto unread = (state.unreadCounter || state.unread);
+		if (_thread->asTopic() && !unread) {
+			_markRead->hide();
+			return;
+		}
+		_markRead->setText(unread
+			? tr::lng_context_mark_read(tr::now)
+			: tr::lng_context_mark_unread(tr::now));
+		_markRead->setClickedCallback([=] {
+			_actions.fire({ .markRead = unread, .markUnread = !unread });
+		});
+		_markRead->show();
+	}, _markRead->lifetime());
+
+	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
+	_markRead->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+		shadow->setGeometry(
+			geometry.x(),
+			geometry.y() - st::lineWidth,
+			geometry.width(),
+			st::lineWidth);
+	}, shadow->lifetime());
+	shadow->showOn(_markRead->shownValue());
+}
+
+void Item::setupBackground() {
+	const auto ratio = style::DevicePixelRatio();
+	_bg = QImage(
+		size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+
+	const auto paint = [=] {
+		auto p = QPainter(&_bg);
+		Window::SectionWidget::PaintBackground(
+			p,
+			_theme.get(),
+			QSize(width(), height() * 2),
+			QRect(QPoint(), size()));
+	};
+	paint();
+	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
+		paint();
+		update();
+	}, lifetime());
+}
+
+void Item::setupHistory() {
 	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
 		_session,
 		static_cast<ListDelegate*>(this)));
-	_scroll->setGeometry(rect());
+
+	_markRead->shownValue() | rpl::start_with_next([=](bool shown) {
+		const auto top = _top->height();
+		const auto bottom = shown ? _markRead->height() : 0;
+		_scroll->setGeometry(rect().marginsRemoved({ 0, top, 0, bottom }));
+	}, _markRead->lifetime());
+
 	_scroll->scrolls(
 	) | rpl::start_with_next([=] {
 		updateInnerVisibleArea();
@@ -209,39 +447,6 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 	_inner->setAttribute(Qt::WA_TransparentForMouseEvents);
 }
 
-not_null<QAction*> Item::action() const {
-	return _dummyAction;
-}
-
-bool Item::isEnabled() const {
-	return false;
-}
-
-int Item::contentHeight() const {
-	return st::previewMenu.maxHeight;
-}
-
-void Item::setupBackground() {
-	const auto ratio = style::DevicePixelRatio();
-	_bg = QImage(
-		size() * ratio,
-		QImage::Format_ARGB32_Premultiplied);
-
-	const auto paint = [=] {
-		auto p = QPainter(&_bg);
-		Window::SectionWidget::PaintBackground(
-			p,
-			_theme.get(),
-			QSize(width(), height() * 2),
-			QRect(QPoint(), size()));
-	};
-	paint();
-	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
-		paint();
-		update();
-	}, lifetime());
-}
-
 void Item::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 	p.drawImage(0, 0, _bg);
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.h b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
index 9445b61718dbc..0598725c21226 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.h
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.h
@@ -22,6 +22,8 @@ namespace HistoryView {
 struct ChatPreviewAction {
 	FullMsgId openItemId;
 	bool openInfo = false;
+	bool markRead = false;
+	bool markUnread = false;
 };
 
 struct ChatPreview {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 6cc611fdbda92..e460b4dc83d25 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -231,12 +231,17 @@ TopicIconButton::TopicIconButton(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
 	not_null<Data::ForumTopic*> topic)
+: TopicIconButton(parent, topic, [=] {
+	return controller->isGifPausedAtLeastFor(Window::GifPauseReason::Layer);
+}) {
+}
+
+TopicIconButton::TopicIconButton(
+	QWidget *parent,
+	not_null<Data::ForumTopic*> topic,
+	Fn<bool()> paused)
 : AbstractButton(parent)
-, _view(
-		topic,
-		[=] { return controller->isGifPausedAtLeastFor(
-			Window::GifPauseReason::Layer); },
-		[=] { update(); }) {
+, _view(topic, paused, [=] { update(); }) {
 	resize(st::infoTopicCover.photo.size);
 	paintRequest(
 	) | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.h b/Telegram/SourceFiles/info/profile/info_profile_cover.h
index 20389e7c5e132..59a857eb69c7f 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.h
@@ -82,6 +82,10 @@ class TopicIconButton final : public Ui::AbstractButton {
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
 		not_null<Data::ForumTopic*> topic);
+	TopicIconButton(
+		QWidget *parent,
+		not_null<Data::ForumTopic*> topic,
+		Fn<bool()> paused);
 
 private:
 	TopicIconView _view;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 36e3b59470c1f..8bba17e8770b4 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1090,3 +1090,25 @@ previewMenu: PopupMenu(defaultPopupMenu) {
 		shadow: boxRoundShadow;
 	}
 }
+previewTop: PeerListItem(defaultPeerListItem) {
+	height: 52px;
+	photoPosition: point(10px, 6px);
+	namePosition: point(60px, 9px);
+	statusPosition: point(60px, 27px);
+	photoSize: 40px;
+}
+previewMarkRead: FlatButton(historyComposeButton) {
+	height: 40px;
+	textTop: 10px;
+}
+previewName: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	textFg: windowFg;
+}
+previewStatus: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+}
+previewUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(40px, 40px);
+	photoSize: 40px;
+}

From 470b3a2cbd0ca980ad0376c74367a65010ffd8e3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 8 May 2024 17:14:30 +0400
Subject: [PATCH 151/400] Fix preview showing on fast userpic click.

---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index e76b137ec9137..e21dcbcf4814c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1760,6 +1760,8 @@ void InnerWidget::mousePressReleased(
 		QPoint globalPosition,
 		Qt::MouseButton button,
 		Qt::KeyboardModifiers modifiers) {
+	_chatPreviewTimer.cancel();
+
 	auto wasDragging = (_dragging != nullptr);
 	if (wasDragging) {
 		updateReorderIndexGetCount();

From 8a6b1677f4ce2b6cda2796a365ae87ebaa36f20e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 27 May 2024 16:28:03 +0300
Subject: [PATCH 152/400] Added userpic views to headers of forwarded messages.

---
 .../history/history_item_components.cpp       | 41 +++++++++++++------
 .../history/history_item_components.h         |  4 +-
 .../history/view/history_view_message.cpp     |  2 +-
 .../history/view/media/history_view_gif.cpp   |  2 +-
 .../media/history_view_media_unwrapped.cpp    |  2 +-
 Telegram/SourceFiles/ui/chat/chat.style       |  1 +
 6 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index b8a64263bc41f..dc4a38c7a0d6a 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -183,8 +183,11 @@ bool HiddenSenderInfo::paintCustomUserpic(
 	return valid;
 }
 
-void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
+void HistoryMessageForwarded::create(
+		const HistoryMessageVia *via,
+		not_null<const HistoryItem*> item) const {
 	auto phrase = TextWithEntities();
+	auto context = Core::MarkedTextContext{};
 	const auto fromChannel = originalSender
 		&& originalSender->isChannel()
 		&& !originalSender->isMegagroup();
@@ -193,16 +196,27 @@ void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
 			? originalSender->name()
 			: originalHiddenSenderInfo->name)
 	};
+	if (originalSender) {
+		context.session = &originalSender->owner().session();
+		context.customEmojiRepaint = [=] {
+			originalSender->owner().requestItemRepaint(item);
+		};
+		phrase = Ui::Text::SingleCustomEmoji(
+			context.session->data().customEmojiManager().peerUserpicEmojiData(
+				originalSender,
+				st::fwdTextUserpicPadding));
+	}
 	if (!originalPostAuthor.isEmpty()) {
-		phrase = tr::lng_forwarded_signed(
-			tr::now,
-			lt_channel,
-			name,
-			lt_user,
-			{ .text = originalPostAuthor },
-			Ui::Text::WithEntities);
+		phrase.append(
+			tr::lng_forwarded_signed(
+				tr::now,
+				lt_channel,
+				name,
+				lt_user,
+				{ .text = originalPostAuthor },
+				Ui::Text::WithEntities));
 	} else {
-		phrase = name;
+		phrase.append(name);
 	}
 	if (story) {
 		phrase = tr::lng_forwarded_story(
@@ -248,18 +262,21 @@ void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
 					: tr::lng_forwarded_psa_default)(
 						tr::now,
 						lt_channel,
-						Ui::Text::Link(phrase.text, QString()), // Link 1.
+						Ui::Text::Wrapped(
+							phrase,
+							EntityType::CustomUrl,
+							QString()), // Link 1.
 						Ui::Text::WithEntities);
 			}
 		} else {
 			phrase = tr::lng_forwarded(
 				tr::now,
 				lt_user,
-				Ui::Text::Link(phrase.text, QString()), // Link 1.
+				Ui::Text::Wrapped(phrase, EntityType::CustomUrl, QString()), // Link 1.
 				Ui::Text::WithEntities);
 		}
 	}
-	text.setMarkedText(st::fwdTextStyle, phrase);
+	text.setMarkedText(st::fwdTextStyle, phrase, kMarkupTextOptions, context);
 
 	text.setLink(1, fromChannel
 		? JumpToMessageClickHandler(originalSender, originalId)
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index e35a804a2a448..44f31f3cd1b40 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -125,7 +125,9 @@ class HiddenSenderInfo {
 };
 
 struct HistoryMessageForwarded : public RuntimeComponent<HistoryMessageForwarded, HistoryItem> {
-	void create(const HistoryMessageVia *via) const;
+	void create(
+		const HistoryMessageVia *via,
+		not_null<const HistoryItem*> item) const;
 
 	[[nodiscard]] bool forwardOfForward() const {
 		return savedFromSender || savedFromHiddenSenderInfo;
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index cc0b4aec747d6..96cbc4648a27a 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -714,7 +714,7 @@ QSize Message::performCountOptimalSize() {
 		const auto via = item->Get<HistoryMessageVia>();
 		const auto entry = logEntryOriginal();
 		if (forwarded) {
-			forwarded->create(via);
+			forwarded->create(via, item);
 		}
 
 		auto mediaDisplayed = false;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 2097ca1b564b6..7dbee04160075 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -293,7 +293,7 @@ QSize Gif::countOptimalSize() {
 		auto reply = _parent->Get<Reply>();
 		auto forwarded = item->Get<HistoryMessageForwarded>();
 		if (forwarded) {
-			forwarded->create(via);
+			forwarded->create(via, item);
 		}
 		maxWidth += additionalWidth(reply, via, forwarded);
 		accumulate_max(maxWidth, _parent->reactionsOptimalWidth());
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
index 4c9e3277c9fb8..beee98df14b0c 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
@@ -59,7 +59,7 @@ QSize UnwrappedMedia::countOptimalSize() {
 		const auto topic = _parent->displayedTopicButton();
 		const auto forwarded = getDisplayedForwardedInfo();
 		if (forwarded) {
-			forwarded->create(via);
+			forwarded->create(via, item);
 		}
 		maxWidth += additionalWidth(topic, reply, via, forwarded);
 		accumulate_max(maxWidth, _parent->reactionsOptimalWidth());
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 8bba17e8770b4..91ba60a37c7da 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -125,6 +125,7 @@ outTextPaletteSelected: TextPalette(outTextPalette) {
 	monoFg: msgOutMonoFgSelected;
 	spoilerFg: msgOutDateFgSelected;
 }
+fwdTextUserpicPadding: margins(0px, 1px, 3px, 0px);
 fwdTextStyle: TextStyle(semiboldTextStyle) {
 	linkUnderline: kLinkUnderlineNever;
 }

From 0dd6ff9d9be23af24da28c9c9ceb60d48a797844 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 21:43:05 +0400
Subject: [PATCH 153/400] Beta version 5.0.5.

- Long press on chat userpic to show quick preview.
- Alt+Click on chat to show quick preview.
- Show author userpics in forwarded messages.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml           |  2 +-
 Telegram/Resources/winrc/Telegram.rc                   |  8 ++++----
 Telegram/Resources/winrc/Updater.rc                    |  8 ++++----
 Telegram/SourceFiles/core/version.h                    |  6 +++---
 .../history/view/history_view_chat_preview.cpp         |  1 -
 Telegram/build/version                                 | 10 +++++-----
 changelog.txt                                          |  6 ++++++
 7 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 519db7170f228..fe3b473ac6e57 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.4.0" />
+    Version="5.0.5.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 5bec7f3bc4310..1f0a7a0454dc3 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,4,0
- PRODUCTVERSION 5,0,4,0
+ FILEVERSION 5,0,5,0
+ PRODUCTVERSION 5,0,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.4.0"
+            VALUE "FileVersion", "5.0.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.4.0"
+            VALUE "ProductVersion", "5.0.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index d44287d24f24b..c334ca569b23e 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,4,0
- PRODUCTVERSION 5,0,4,0
+ FILEVERSION 5,0,5,0
+ PRODUCTVERSION 5,0,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.0.4.0"
+            VALUE "FileVersion", "5.0.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.4.0"
+            VALUE "ProductVersion", "5.0.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 1d8cecd6e7fbd..8de17b03ce517 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5000004;
-constexpr auto AppVersionStr = "5.0.4";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 5000005;
+constexpr auto AppVersionStr = "5.0.5";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index e1316a9eb4ac2..0a7e9a8b98d16 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -269,7 +269,6 @@ void Item::setupTop() {
 		_actions.fire({ .openInfo = true });
 	});
 	_top->paintRequest() | rpl::start_with_next([=](QRect clip) {
-		const auto &st = st::previewTop;
 		auto p = QPainter(_top.get());
 		p.fillRect(clip, st::topBarBg);
 	}, _top->lifetime());
diff --git a/Telegram/build/version b/Telegram/build/version
index 68f36345376e6..5d551a173ea57 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000004
+AppVersion         5000005
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.4
-AppVersionStr      5.0.4
-BetaChannel        0
+AppVersionStrSmall 5.0.5
+AppVersionStr      5.0.5
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 5.0.4
+AppVersionOriginal 5.0.5.beta
diff --git a/changelog.txt b/changelog.txt
index 19f721c8597c4..ddfebe11064f6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+5.0.5 beta (28.05.24)
+
+- Long press on chat userpic to show quick preview.
+- Alt+Click on chat to show quick preview.
+- Show author userpics in forwarded messages.
+
 5.0.4 (28.05.24)
 
 - Fix reply to last message by Ctrl+Up in topics.

From 465fc42718be3bc8d6e1a9cc0be1b61b6eccdc32 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 09:43:40 +0400
Subject: [PATCH 154/400] Fix chat preview in non-default themes.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 0a7e9a8b98d16..b804f73824e45 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -242,6 +242,7 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 		this,
 		tr::lng_context_mark_read(tr::now),
 		st::previewMarkRead)) {
+	_chatStyle->apply(_theme.get());
 	setPointerCursor(false);
 	setMinWidth(st::previewMenu.menu.widthMin);
 	resize(minWidth(), contentHeight());

From d2e600352160420314721b76817988b80d1f3433 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 10:12:56 +0400
Subject: [PATCH 155/400] Ignore right click on preview.

---
 .../view/history_view_chat_preview.cpp        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index b804f73824e45..8ad2a2a6ab554 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -426,16 +426,19 @@ void Item::setupHistory() {
 
 	_scroll->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
-			const auto relative = Ui::MapFrom(
-				_inner.data(),
-				_scroll.get(),
-				static_cast<QMouseEvent*>(e.get())->pos());
-			if (const auto view = _inner->lookupItemByY(relative.y())) {
-				_actions.fire(ChatPreviewAction{
-					.openItemId = view->data()->fullId(),
-				});
-			} else {
-				_actions.fire(ChatPreviewAction{});
+			const auto button = static_cast<QMouseEvent*>(e.get())->button();
+			if (button == Qt::LeftButton) {
+				const auto relative = Ui::MapFrom(
+					_inner.data(),
+					_scroll.get(),
+					static_cast<QMouseEvent*>(e.get())->pos());
+				if (const auto view = _inner->lookupItemByY(relative.y())) {
+					_actions.fire(ChatPreviewAction{
+						.openItemId = view->data()->fullId(),
+					});
+				} else {
+					_actions.fire(ChatPreviewAction{});
+				}
 			}
 		}
 	}, lifetime());

From d6e827e9827dcaba54477fe866b3282025e27ed0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 10:48:41 +0400
Subject: [PATCH 156/400] Fix loading of chat preview messages.

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

diff --git a/Telegram/SourceFiles/data/data_history_messages.cpp b/Telegram/SourceFiles/data/data_history_messages.cpp
index 86b46503d827f..66e888e285966 100644
--- a/Telegram/SourceFiles/data/data_history_messages.cpp
+++ b/Telegram/SourceFiles/data/data_history_messages.cpp
@@ -89,6 +89,13 @@ rpl::producer<SparseIdsSlice> HistoryViewer(
 		using RequestAroundInfo = SparseIdsSliceBuilder::AroundData;
 		builder->insufficientAround(
 		) | rpl::start_with_next([=](const RequestAroundInfo &info) {
+			if (!info.aroundId) {
+				// Ignore messages-count-only requests, because we perform
+				// them with non-zero limit of messages and end up adding
+				// a broken slice with several last messages from the chat
+				// with a non-skip range starting at zero.
+				return;
+			}
 			history->session().api().requestHistory(
 				history,
 				info.aroundId,
@@ -155,7 +162,7 @@ rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
 	};
 	const auto peerId = history->peer->id;
 	const auto topicRootId = MsgId();
-	const auto migratedPeerId = migrateFrom ? migrateFrom->id : peerId;
+	const auto migratedPeerId = migrateFrom ? migrateFrom->id : PeerId(0);
 	using Key = SparseIdsMergedSlice::Key;
 	return SparseIdsMergedSlice::CreateViewer(
 		Key(peerId, topicRootId, migratedPeerId, universalAroundId),

From 2b9e7a6b2568c2265be17289d29f246c406f0c4c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 12:06:30 +0400
Subject: [PATCH 157/400] Show preview on Force-Click on macOS.

---
 .../dialogs/dialogs_inner_widget.cpp          | 25 ++++++++++++++++---
 .../dialogs/dialogs_inner_widget.h            |  2 ++
 .../platform/mac/main_window_mac.h            |  6 +++++
 .../platform/mac/main_window_mac.mm           | 10 ++++++++
 Telegram/SourceFiles/window/main_window.h     |  4 +++
 5 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index e21dcbcf4814c..3b996f3851c0f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -332,6 +332,11 @@ InnerWidget::InnerWidget(
 		switchToFilter(filterId);
 	}, lifetime());
 
+	_controller->window().widget()->globalForceClicks(
+	) | rpl::start_with_next([=](QPoint globalPosition) {
+		processGlobalForceClick(globalPosition);
+	}, lifetime());
+
 	session().data().stories().incrementPreloadingMainSources();
 
 	handleChatListEntryRefreshes();
@@ -1424,6 +1429,16 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 	}
 }
 
+void InnerWidget::processGlobalForceClick(QPoint globalPosition) {
+	const auto parent = parentWidget();
+	if (_pressButton == Qt::LeftButton
+		&& parent->rect().contains(parent->mapFromGlobal(globalPosition))
+		&& pressShowsPreview(false)) {
+		_chatPreviewWillBeFor = computeChosenRow().key;
+		showChatPreview(false);
+	}
+}
+
 void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	selectByMouse(e->globalPos());
 
@@ -1761,6 +1776,7 @@ void InnerWidget::mousePressReleased(
 		Qt::MouseButton button,
 		Qt::KeyboardModifiers modifiers) {
 	_chatPreviewTimer.cancel();
+	_pressButton = Qt::NoButton;
 
 	auto wasDragging = (_dragging != nullptr);
 	if (wasDragging) {
@@ -3598,8 +3614,11 @@ ChosenRow InnerWidget::computeChosenRow() const {
 
 bool InnerWidget::isUserpicPress() const {
 	return  (_lastRowLocalMouseX >= 0)
-		&& (_lastRowLocalMouseX < _st->nameLeft)
-		&& (width() > _narrowWidth);
+		&& (_lastRowLocalMouseX < _st->nameLeft);
+}
+
+bool InnerWidget::isUserpicPressOnWide() const {
+	return isUserpicPress() && (width() > _narrowWidth);
 }
 
 bool InnerWidget::pressShowsPreview(bool onlyUserpic) const {
@@ -3625,7 +3644,7 @@ bool InnerWidget::chooseRow(
 			ChosenRow row,
 			Qt::KeyboardModifiers modifiers) {
 		row.newWindow = (modifiers & Qt::ControlModifier);
-		row.userpicClick = isUserpicPress();
+		row.userpicClick = isUserpicPressOnWide();
 		return row;
 	};
 	auto chosen = modifyChosenRow(computeChosenRow(), modifiers);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index fe9a3d926ee67..9194df36e4893 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -123,6 +123,7 @@ class InnerWidget final : public Ui::RpWidget {
 	void resizeEmptyLabel();
 
 	[[nodiscard]] bool isUserpicPress() const;
+	[[nodiscard]] bool isUserpicPressOnWide() const;
 	[[nodiscard]] bool pressShowsPreview(bool onlyUserpic) const;
 	void cancelChatPreview();
 	void showChatPreview(bool onlyUserpic);
@@ -258,6 +259,7 @@ class InnerWidget final : public Ui::RpWidget {
 		QPoint globalPosition,
 		Qt::MouseButton button,
 		Qt::KeyboardModifiers modifiers);
+	void processGlobalForceClick(QPoint globalPosition);
 	void clearIrrelevantState();
 	void selectByMouse(QPoint globalPosition);
 	void preloadRowsData();
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index 6c2d15d07254e..2a3a59b9cfd14 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -28,6 +28,10 @@ class MainWindow : public Window::MainWindow {
 
 	void updateWindowIcon() override;
 
+	rpl::producer<QPoint> globalForceClicks() override {
+		return _forceClicks.events();
+	}
+
 	class Private;
 
 protected:
@@ -85,7 +89,9 @@ class MainWindow : public Window::MainWindow {
 	QAction *psMonospace = nullptr;
 	QAction *psClearFormat = nullptr;
 
+	rpl::event_stream<QPoint> _forceClicks;
 	int _customTitleHeight = 0;
+	int _lastPressureStage = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 0b2adb9aab44b..9b0dd14bbfd07 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -310,6 +310,16 @@ QString strNotificationAboutScreenUnlocked() {
 			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
 				imeCompositionStartReceived();
 			});
+		} else if ([event type] == NSEventTypePressure) {
+			const auto stage = [event stage];
+			if (_lastPressureStage != stage) {
+				_lastPressureStage = stage;
+				if (stage == 2) {
+					Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+						_forceClicks.fire(QCursor::pos());
+					});
+				}
+			}
 		}
 	}
 	return false;
diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h
index 79dc3c6fe786d..67f38567ca50b 100644
--- a/Telegram/SourceFiles/window/main_window.h
+++ b/Telegram/SourceFiles/window/main_window.h
@@ -144,6 +144,10 @@ class MainWindow : public Ui::RpWindow {
 		Core::WindowPosition initial,
 		QSize minSize) const;
 
+	[[nodiscard]] virtual rpl::producer<QPoint> globalForceClicks() {
+		return rpl::never<QPoint>();
+	}
+
 protected:
 	void leaveEventHook(QEvent *e) override;
 

From a9a0fe7cf5430549a542b3bb1c69d879fa0df060 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 12:07:56 +0400
Subject: [PATCH 158/400] Fix RTL chat names in preview.

---
 .../view/history_view_chat_preview.cpp        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 8ad2a2a6ab554..4baed10bb9b8f 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -275,11 +275,13 @@ void Item::setupTop() {
 	}, _top->lifetime());
 
 	const auto topic = _thread->asTopic();
+	auto nameValue = (topic
+		? Info::Profile::TitleValue(topic)
+		: Info::Profile::NameValue(_thread->peer())
+	) | rpl::start_spawning(_top->lifetime());
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(
 		_top.get(),
-		(topic
-			? Info::Profile::TitleValue(topic)
-			: Info::Profile::NameValue(_thread->peer())),
+		rpl::duplicate(nameValue),
 		st::previewName);
 	name->setAttribute(Qt::WA_TransparentForMouseEvents);
 	auto statusFields = StatusValue(
@@ -322,12 +324,19 @@ void Item::setupTop() {
 	}
 
 	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
-	_top->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	rpl::combine(
+		_top->widthValue(),
+		std::move(nameValue)
+	) | rpl::start_with_next([=](int width, const auto &) {
 		const auto &st = st::previewTop;
-		name->resizeToWidth(geometry.width()
+		name->resizeToNaturalWidth(width
 			- st.namePosition.x()
 			- st.photoPosition.x());
 		name->move(st::previewTop.namePosition);
+	}, name->lifetime());
+
+	_top->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+		const auto &st = st::previewTop;
 		status->resizeToWidth(geometry.width()
 			- st.statusPosition.x()
 			- st.photoPosition.x());

From e2b78b673be0132afffc2a967f62464de94514fd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 12:08:22 +0400
Subject: [PATCH 159/400] Fix unintentional search focus.

---
 .../SourceFiles/chat_helpers/tabbed_section.cpp |  3 +++
 Telegram/SourceFiles/mainwidget.cpp             | 17 +++++++++++++----
 Telegram/SourceFiles/mainwidget.h               |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp
index 3759697e33a85..92f6aaa00769d 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp
@@ -28,6 +28,9 @@ TabbedSection::TabbedSection(
 	not_null<Window::SessionController*> controller)
 : Window::SectionWidget(parent, controller)
 , _selector(controller->tabbedSelector()) {
+	if (Ui::InFocusChain(_selector)) {
+		parent->window()->setFocus();
+	}
 	_selector->setParent(this);
 	_selector->setRoundRadius(0);
 	_selector->setGeometry(rect());
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index c9acfef92775b..4dd47970dfe5b 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1772,7 +1772,7 @@ void MainWidget::showNewSection(
 		_thirdSection = std::move(newThirdSection);
 		_thirdSection->removeRequests(
 		) | rpl::start_with_next([=] {
-			_thirdSection.destroy();
+			destroyThirdSection();
 			_thirdShadow.destroy();
 			updateControlsGeometry();
 		}, _thirdSection->lifetime());
@@ -2289,7 +2289,7 @@ void MainWidget::updateControlsGeometry() {
 			}
 		}
 	} else {
-		_thirdSection.destroy();
+		destroyThirdSection();
 		_thirdShadow.destroy();
 	}
 	const auto mainSectionTop = getMainSectionTop();
@@ -2408,6 +2408,15 @@ void MainWidget::updateControlsGeometry() {
 	floatPlayerUpdatePositions();
 }
 
+void MainWidget::destroyThirdSection() {
+	if (const auto strong = _thirdSection.data()) {
+		if (Ui::InFocusChain(strong)) {
+			setFocus();
+		}
+	}
+	_thirdSection.destroy();
+}
+
 void MainWidget::refreshResizeAreas() {
 	if (!isOneColumn() && _dialogs) {
 		ensureFirstColumnResizeAreaCreated();
@@ -2555,7 +2564,7 @@ void MainWidget::updateThirdColumnToCurrentChat(
 		if (saveThirdSectionToStackBack()) {
 			_stack.back()->setThirdSectionMemento(
 				_thirdSection->createMemento());
-			_thirdSection.destroy();
+			destroyThirdSection();
 		}
 	};
 	auto &settings = Core::App().settings();
@@ -2601,7 +2610,7 @@ void MainWidget::updateThirdColumnToCurrentChat(
 		settings.setTabbedReplacedWithInfo(false);
 		if (!key) {
 			if (_thirdSection) {
-				_thirdSection.destroy();
+				destroyThirdSection();
 				_thirdShadow.destroy();
 				updateControlsGeometry();
 			}
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 0f769a53f3697..14e1ef2abe1f2 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -279,6 +279,7 @@ class MainWidget final
 	void showNewSection(
 		std::shared_ptr<Window::SectionMemento> memento,
 		const SectionShow &params);
+	void destroyThirdSection();
 
 	Window::SectionSlideParams prepareThirdSectionAnimation(Window::SectionWidget *section);
 

From 7d636820ac1509e99916e93d911bc0c99ac1c7a4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 10:26:48 +0400
Subject: [PATCH 160/400] Show last updated topic preview on Alt+Click.

---
 .../dialogs/dialogs_inner_widget.cpp          | 22 +++++++++++++++----
 .../dialogs/dialogs_inner_widget.h            |  1 +
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 3b996f3851c0f..4a7dc475c3082 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1429,12 +1429,25 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 	}
 }
 
+Key InnerWidget::computeChatPreviewRow() const {
+	auto result = computeChosenRow().key;
+	if (const auto peer = result.peer()) {
+		const auto topicId = _pressedTopicJump
+			? _pressedTopicJumpRootId
+			: 0;
+		if (const auto topic = peer->forumTopicFor(topicId)) {
+			return topic;
+		}
+	}
+	return result;
+}
+
 void InnerWidget::processGlobalForceClick(QPoint globalPosition) {
 	const auto parent = parentWidget();
 	if (_pressButton == Qt::LeftButton
 		&& parent->rect().contains(parent->mapFromGlobal(globalPosition))
 		&& pressShowsPreview(false)) {
-		_chatPreviewWillBeFor = computeChosenRow().key;
+		_chatPreviewWillBeFor = computeChatPreviewRow();
 		showChatPreview(false);
 	}
 }
@@ -1454,7 +1467,7 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	const auto alt = (e->modifiers() & Qt::AltModifier);
 	const auto onlyUserpic = !alt;
 	if (pressShowsPreview(onlyUserpic)) {
-		_chatPreviewWillBeFor = computeChosenRow().key;
+		_chatPreviewWillBeFor = computeChatPreviewRow();
 		if (alt) {
 			showChatPreview(onlyUserpic);
 			return;
@@ -2337,7 +2350,7 @@ void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 void InnerWidget::showChatPreview(bool onlyUserpic) {
 	const auto key = base::take(_chatPreviewWillBeFor);
 	cancelChatPreview();
-	if (!pressShowsPreview(onlyUserpic) || key != computeChosenRow().key) {
+	if (!pressShowsPreview(onlyUserpic) || key != computeChatPreviewRow()) {
 		return;
 	}
 	ClickHandler::unpressed();
@@ -3627,7 +3640,8 @@ bool InnerWidget::pressShowsPreview(bool onlyUserpic) const {
 	}
 	const auto key = computeChosenRow().key;
 	if (const auto history = key.history()) {
-		return !history->peer->isForum();
+		return !history->peer->isForum()
+			|| (_pressedTopicJump && _pressedTopicJumpRootId);
 	}
 	return key.topic() != nullptr;
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 9194df36e4893..f78c220ade95f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -398,6 +398,7 @@ class InnerWidget final : public Ui::RpWidget {
 	void trackSearchResultsForum(Data::Forum *forum);
 
 	[[nodiscard]] QBrush currentBg() const;
+	[[nodiscard]] Key computeChatPreviewRow() const;
 
 	[[nodiscard]] const std::vector<Key> &pinnedChatsOrder() const;
 	void checkReorderPinnedStart(QPoint localPosition);

From 28cbb02b2099a4e43c1bccfc7f43b8db0a825cfe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 10:40:30 +0400
Subject: [PATCH 161/400] Jump to chat only by Double-Click on preview.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 4baed10bb9b8f..56d7f648c62a8 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -434,7 +434,7 @@ void Item::setupHistory() {
 	_scroll->setOverscrollTypes(Type::Real, Type::Real);
 
 	_scroll->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
-		if (e->type() == QEvent::MouseButtonPress) {
+		if (e->type() == QEvent::MouseButtonDblClick) {
 			const auto button = static_cast<QMouseEvent*>(e.get())->button();
 			if (button == Qt::LeftButton) {
 				const auto relative = Ui::MapFrom(

From 0527e9a0f728c66138136b58f7164ab2dee07af4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 16:41:51 +0400
Subject: [PATCH 162/400] Fix adding bot as admin to channel.

---
 .../SourceFiles/boxes/add_contact_box.cpp     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index 45d4b1e9978cb..6b9a0852c2b98 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -192,20 +192,27 @@ void ShowAddParticipantsError(
 			&& channel
 			&& !channel->isMegagroup()
 			&& channel->canAddAdmins()) {
-			const auto makeAdmin = [=] {
+			const auto makeAdmin = [=](Fn<void()> close) {
 				const auto user = forbidden.users.front();
 				const auto weak = std::make_shared<QPointer<EditAdminBox>>();
-				const auto close = [=](auto&&...) {
-					if (*weak) {
-						(*weak)->closeBox();
+				const auto done = [=](auto&&...) {
+					if (const auto strong = weak->data()) {
+						strong->uiShow()->showToast(
+							tr::lng_box_done(tr::now));
+						strong->closeBox();
+					}
+				};
+				const auto fail = [=] {
+					if (const auto strong = weak->data()) {
+						strong->closeBox();
 					}
 				};
 				const auto saveCallback = SaveAdminCallback(
 					show,
 					channel,
 					user,
-					close,
-					close);
+					done,
+					fail);
 				auto box = Box<EditAdminBox>(
 					channel,
 					user,
@@ -214,6 +221,7 @@ void ShowAddParticipantsError(
 				box->setSaveCallback(saveCallback);
 				*weak = box.data();
 				show->showBox(std::move(box));
+				close();
 			};
 			show->showBox(
 				Ui::MakeConfirmBox({

From 4f5594c8ccbfafb6d47aa418aab6b320360fcd0b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 17:10:12 +0400
Subject: [PATCH 163/400] ChatNext jumps to first chat if no chat opened.

Fixes #27963.
---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 4a7dc475c3082..6527140b3b251 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -4030,6 +4030,12 @@ void InnerWidget::setupShortcuts() {
 			request->check(Command::ChatNext) && request->handle([=] {
 				return jumpToDialogRow(next);
 			});
+		} else if (_state == WidgetState::Default
+			? !_shownList->empty()
+			: !_filterResults.empty()) {
+			request->check(Command::ChatNext) && request->handle([=] {
+				return jumpToDialogRow(first);
+			});
 		}
 		request->check(Command::ChatFirst) && request->handle([=] {
 			return jumpToDialogRow(first);

From aa4156d1e740ba3ee3c680ff17d74fb2f62b593d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 17:12:28 +0400
Subject: [PATCH 164/400] Ignore shortcuts when preview is shown.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 6527140b3b251..3c3ab74f6d86d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -3997,7 +3997,8 @@ void InnerWidget::setupShortcuts() {
 		return isActiveWindow()
 			&& !_controller->isLayerShown()
 			&& !_controller->window().locked()
-			&& !_childListShown.current().shown;
+			&& !_childListShown.current().shown
+			&& !_chatPreviewKey;
 	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 

From a9dd9aeb90184bc81e4cc18445a4638434fab9f0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 17:38:50 +0400
Subject: [PATCH 165/400] Use InnoSetup SignTool for setup signing.

Fixes #27583.
---
 Telegram/build/build.bat | 6 ------
 Telegram/build/setup.iss | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat
index 43f145c55f433..3f3b65caaf0a0 100644
--- a/Telegram/build/build.bat
+++ b/Telegram/build/build.bat
@@ -208,12 +208,6 @@ if %BuildUWP% equ 0 (
     iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppVersionFull=%AppVersionStrFull% "/dReleasePath=%ReleasePath%" "/dMyBuildTarget=%BuildTarget%" "%FullScriptPath%setup.iss"
     if %errorlevel% neq 0 goto error
     if not exist "%SetupFile%" goto error
-:sign3
-    call "%SignPath%" "%SetupFile%"
-    if %errorlevel% neq 0 (
-      timeout /t 3
-      goto sign3
-    )
   )
 
   call Packer.exe -version %VersionForPacker% -path %BinaryName%.exe -path Updater.exe -path "modules\%Platform%\d3d\d3dcompiler_47.dll" -target %BuildTarget% %AlphaBetaParam%
diff --git a/Telegram/build/setup.iss b/Telegram/build/setup.iss
index 8b07155816873..5c5ee763551f3 100644
--- a/Telegram/build/setup.iss
+++ b/Telegram/build/setup.iss
@@ -34,6 +34,7 @@ CloseApplications=force
 DisableDirPage=no
 DisableProgramGroupPage=no
 WizardStyle=modern
+SignTool=sha256
 
 #if MyBuildTarget == "win64"
   ArchitecturesAllowed="x64 arm64"

From 2bbc7406da448659aa2ef7de69a8f95115af6350 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 19:06:51 +0400
Subject: [PATCH 166/400] Beta version 5.0.6.

- Fix chat preview with non-default themes.
- Fix chat preview crash when scrolling up.
- Jump to chat from preview only by Double-Click.
- Show chat preview with Force Touch on macOS.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 7 +++++++
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index fe3b473ac6e57..cc2453f6b1210 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.5.0" />
+    Version="5.0.6.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 1f0a7a0454dc3..0a0a61d845a71 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,5,0
- PRODUCTVERSION 5,0,5,0
+ FILEVERSION 5,0,6,0
+ PRODUCTVERSION 5,0,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.0.5.0"
+            VALUE "FileVersion", "5.0.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.5.0"
+            VALUE "ProductVersion", "5.0.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index c334ca569b23e..1b7249bf0bacb 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,5,0
- PRODUCTVERSION 5,0,5,0
+ FILEVERSION 5,0,6,0
+ PRODUCTVERSION 5,0,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.0.5.0"
+            VALUE "FileVersion", "5.0.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.5.0"
+            VALUE "ProductVersion", "5.0.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 8de17b03ce517..911f4794f3162 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5000005;
-constexpr auto AppVersionStr = "5.0.5";
+constexpr auto AppVersion = 5000006;
+constexpr auto AppVersionStr = "5.0.6";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 5d551a173ea57..2a02b657bd055 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000005
+AppVersion         5000006
 AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.5
-AppVersionStr      5.0.5
+AppVersionStrSmall 5.0.6
+AppVersionStr      5.0.6
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 5.0.5.beta
+AppVersionOriginal 5.0.6.beta
diff --git a/changelog.txt b/changelog.txt
index ddfebe11064f6..70728871a40ff 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+5.0.6 beta (30.05.24)
+
+- Fix chat preview with non-default themes.
+- Fix chat preview crash when scrolling up.
+- Jump to chat from preview only by Double-Click.
+- Show chat preview with Force Touch on macOS.
+
 5.0.5 beta (28.05.24)
 
 - Long press on chat userpic to show quick preview.

From f8188f360a81db7eb73ce542575ce600f90fffb9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 May 2024 17:49:49 +0400
Subject: [PATCH 167/400] Update API scheme to layer 180.

---
 Telegram/SourceFiles/api/api_common.h         |  1 +
 Telegram/SourceFiles/api/api_polls.cpp        |  3 ++-
 Telegram/SourceFiles/api/api_sending.cpp      |  6 ++++--
 Telegram/SourceFiles/api/api_updates.cpp      |  6 ++++--
 Telegram/SourceFiles/apiwrap.cpp              | 12 +++++++----
 .../data/business/data_shortcut_messages.cpp  |  3 ++-
 .../data/components/scheduled_messages.cpp    |  6 ++++--
 Telegram/SourceFiles/data/data_session.cpp    |  3 ++-
 Telegram/SourceFiles/data/data_types.h        |  1 +
 .../admin_log/history_admin_log_item.cpp      |  3 ++-
 Telegram/SourceFiles/history/history_item.cpp |  6 +++++-
 Telegram/SourceFiles/history/history_item.h   |  6 ++++--
 .../media/stories/media_stories_share.cpp     |  9 ++++++--
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 21 +++++++++++++------
 .../settings/settings_privacy_controllers.cpp |  3 ++-
 .../SourceFiles/window/window_peer_menu.cpp   |  3 ++-
 16 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_common.h b/Telegram/SourceFiles/api/api_common.h
index fe0d489b01262..9c3939bf56b9e 100644
--- a/Telegram/SourceFiles/api/api_common.h
+++ b/Telegram/SourceFiles/api/api_common.h
@@ -23,6 +23,7 @@ struct SendOptions {
 	PeerData *sendAs = nullptr;
 	TimeId scheduled = 0;
 	BusinessShortcutId shortcutId = 0;
+	EffectId effectId = 0;
 	bool silent = false;
 	bool handleSupportSwitch = false;
 	bool hideViaBot = false;
diff --git a/Telegram/SourceFiles/api/api_polls.cpp b/Telegram/SourceFiles/api/api_polls.cpp
index 3532e2c79d66b..b2422af25e5b2 100644
--- a/Telegram/SourceFiles/api/api_polls.cpp
+++ b/Telegram/SourceFiles/api/api_polls.cpp
@@ -89,7 +89,8 @@ void Polls::create(
 			MTPVector<MTPMessageEntity>(),
 			MTP_int(action.options.scheduled),
 			(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
-			Data::ShortcutIdToMTP(_session, action.options.shortcutId)
+			Data::ShortcutIdToMTP(_session, action.options.shortcutId),
+			MTP_long(action.options.effectId)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 		if (clearCloudDraft) {
 			history->finishSavingCloudDraft(
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index d91943fe048d4..9528ae446fa50 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -165,7 +165,8 @@ void SendExistingMedia(
 				sentEntities,
 				MTP_int(action.options.scheduled),
 				(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
-				Data::ShortcutIdToMTP(session, action.options.shortcutId)
+				Data::ShortcutIdToMTP(session, action.options.shortcutId),
+				MTP_long(action.options.effectId)
 			), [=](const MTPUpdates &result, const MTP::Response &response) {
 		}, [=](const MTP::Error &error, const MTP::Response &response) {
 			if (error.code() == 400
@@ -335,7 +336,8 @@ bool SendDice(MessageToSend &message) {
 			MTP_vector<MTPMessageEntity>(),
 			MTP_int(action.options.scheduled),
 			(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
-			Data::ShortcutIdToMTP(session, action.options.shortcutId)
+			Data::ShortcutIdToMTP(session, action.options.shortcutId),
+			MTP_long(action.options.effectId)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 	}, [=](const MTP::Error &error, const MTP::Response &response) {
 		api->sendMessageFail(error, peer, randomId, newId);
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 314e6c8621860..6613a1df3dcf4 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -1137,7 +1137,8 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				MTPMessageReactions(),
 				MTPVector<MTPRestrictionReason>(),
 				MTP_int(d.vttl_period().value_or_empty()),
-				MTPint()), // quick_reply_shortcut_id
+				MTPint(), // quick_reply_shortcut_id
+				MTPlong()), // effect
 			MessageFlags(),
 			NewMessageType::Unread);
 	} break;
@@ -1172,7 +1173,8 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				MTPMessageReactions(),
 				MTPVector<MTPRestrictionReason>(),
 				MTP_int(d.vttl_period().value_or_empty()),
-				MTPint()), // quick_reply_shortcut_id
+				MTPint(), // quick_reply_shortcut_id
+				MTPlong()), // effect
 			MessageFlags(),
 			NewMessageType::Unread);
 	} break;
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 32e97c77f1d85..c16926c73c1bf 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3869,7 +3869,8 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 					sentEntities,
 					MTP_int(action.options.scheduled),
 					(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
-					mtpShortcut
+					mtpShortcut,
+					MTP_long(action.options.effectId)
 				), done, fail);
 		} else {
 			histories.sendPreparedMessage(
@@ -3886,7 +3887,8 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 					sentEntities,
 					MTP_int(action.options.scheduled),
 					(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
-					mtpShortcut
+					mtpShortcut,
+					MTP_long(action.options.effectId)
 				), done, fail);
 		}
 		isFirst = false;
@@ -4180,7 +4182,8 @@ void ApiWrap::sendMediaWithRandomId(
 			sentEntities,
 			MTP_int(options.scheduled),
 			(options.sendAs ? options.sendAs->input : MTP_inputPeerEmpty()),
-			Data::ShortcutIdToMTP(_session, options.shortcutId)
+			Data::ShortcutIdToMTP(_session, options.shortcutId),
+			MTP_long(options.effectId)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 		if (done) done(true);
 		if (updateRecentStickers) {
@@ -4282,7 +4285,8 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 			MTP_vector<MTPInputSingleMedia>(medias),
 			MTP_int(album->options.scheduled),
 			(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
-			Data::ShortcutIdToMTP(_session, album->options.shortcutId)
+			Data::ShortcutIdToMTP(_session, album->options.shortcutId),
+			MTP_long(album->options.effectId)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 		_sendingAlbums.remove(groupId);
 	}, [=](const MTP::Error &error, const MTP::Response &response) {
diff --git a/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp b/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
index fbe30449b5cf7..57f8753a28c94 100644
--- a/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
@@ -87,7 +87,8 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			MTPMessageReactions(),
 			MTPVector<MTPRestrictionReason>(),
 			MTP_int(data.vttl_period().value_or_empty()),
-			MTP_int(shortcutId));
+			MTP_int(shortcutId),
+			MTP_long(data.veffect().value_or_empty()));
 	});
 }
 
diff --git a/Telegram/SourceFiles/data/components/scheduled_messages.cpp b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
index 92e0da8808f00..4313a88577d0a 100644
--- a/Telegram/SourceFiles/data/components/scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
@@ -91,7 +91,8 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			MTPMessageReactions(),
 			MTPVector<MTPRestrictionReason>(),
 			MTP_int(data.vttl_period().value_or_empty()),
-			MTPint()); // quick_reply_shortcut_id
+			MTPint(), // quick_reply_shortcut_id
+			MTP_long(data.veffect().value_or_empty())); // effect
 	});
 }
 
@@ -259,7 +260,8 @@ void ScheduledMessages::sendNowSimpleMessage(
 			MTPMessageReactions(),
 			MTPVector<MTPRestrictionReason>(),
 			MTP_int(update.vttl_period().value_or_empty()),
-			MTPint()), // quick_reply_shortcut_id
+			MTPint(), // quick_reply_shortcut_id
+			MTP_long(local->effectId())), // effect
 		localFlags,
 		NewMessageType::Unread);
 
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 892830edeb871..f46fb1dc08d62 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -4571,7 +4571,8 @@ void Session::insertCheckedServiceNotification(
 				MTPMessageReactions(),
 				MTPVector<MTPRestrictionReason>(),
 				MTPint(), // ttl_period
-				MTPint()), // quick_reply_shortcut_id
+				MTPint(), // quick_reply_shortcut_id
+				MTPlong()), // effect
 			localFlags,
 			NewMessageType::Unread);
 	}
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index ca11c8969a80b..acc5c89157d64 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -138,6 +138,7 @@ using PollId = uint64;
 using WallPaperId = uint64;
 using CallId = uint64;
 using BotAppId = uint64;
+using EffectId = uint64;
 
 constexpr auto CancelledWebPageId = WebPageId(0xFFFFFFFFFFFFFFFFULL);
 
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
index 72d797460dfe3..7270696cd1d0d 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -139,7 +139,8 @@ MTPMessage PrepareLogMessage(const MTPMessage &message, TimeId newDate) {
 			MTPMessageReactions(),
 			MTPVector<MTPRestrictionReason>(),
 			MTPint(), // ttl_period
-			MTPint()); // quick_reply_shortcut_id
+			MTPint(), // quick_reply_shortcut_id
+			MTP_long(data.veffect().value_or_empty()));
 	});
 }
 
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 53ba1c67c4b32..4326bed57f2ca 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -3116,6 +3116,10 @@ MessageGroupId HistoryItem::groupId() const {
 	return _groupId;
 }
 
+EffectId HistoryItem::effectId() const {
+	return _effectId;
+}
+
 bool HistoryItem::isEmpty() const {
 	return _text.empty()
 		&& !_media
@@ -4972,7 +4976,7 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 }
 
 void HistoryItem::setSelfDestruct(
-		HistoryServiceSelfDestruct::Type type,
+		HistorySelfDestructType type,
 		MTPint mtpTTLvalue) {
 	UpdateComponents(HistoryServiceSelfDestruct::Bit());
 	const auto selfdestruct = Get<HistoryServiceSelfDestruct>();
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index c7d3e59aae2ac..de437cfe43bd6 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -101,6 +101,7 @@ struct HistoryItemCommonFields {
 	UserId viaBotId = 0;
 	QString postAuthor;
 	uint64 groupedId = 0;
+	EffectId effectId = 0;
 	HistoryMessageMarkupData markup;
 };
 
@@ -493,8 +494,8 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 		not_null<const HistoryMessageForwarded*> forwarded) const;
 
 	[[nodiscard]] bool isEmpty() const;
-
 	[[nodiscard]] MessageGroupId groupId() const;
+	[[nodiscard]] EffectId effectId() const;
 
 	[[nodiscard]] const HistoryMessageReplyMarkup *inlineReplyMarkup() const {
 		return const_cast<HistoryItem*>(this)->inlineReplyMarkup();
@@ -647,8 +648,9 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	int _boostsApplied = 0;
 	BusinessShortcutId _shortcutId = 0;
 
-	HistoryView::Element *_mainView = nullptr;
 	MessageGroupId _groupId = MessageGroupId();
+	EffectId _effectId = 0;
+	HistoryView::Element *_mainView = nullptr;
 
 	friend class HistoryView::Element;
 	friend class HistoryView::Message;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.cpp b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
index 76e353c006e24..bfd0e5c0035aa 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_share.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
@@ -163,12 +163,17 @@ namespace Media::Stories {
 					MTPVector<MTPMessageEntity>(),
 					MTP_int(action.options.scheduled),
 					MTP_inputPeerEmpty(),
-					Data::ShortcutIdToMTP(session, action.options.shortcutId)
+					Data::ShortcutIdToMTP(
+						session,
+						action.options.shortcutId),
+					MTP_long(action.options.effectId)
 				), [=](
 						const MTPUpdates &result,
 						const MTP::Response &response) {
 					done();
-				}, [=](const MTP::Error &error, const MTP::Response &response) {
+				}, [=](
+						const MTP::Error &error,
+						const MTP::Response &response) {
 					api->sendMessageFail(error, threadPeer, randomId);
 					done();
 				});
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 963785e0b413e..d83726b0e2fed 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -114,7 +114,7 @@ chatPhotoEmpty#37c1011c = ChatPhoto;
 chatPhoto#1c6e1c11 flags:# has_video:flags.0?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = ChatPhoto;
 
 messageEmpty#90a6ca84 flags:# id:int peer_id:flags.0?Peer = Message;
-message#2357bf25 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true pinned:flags.24?true noforwards:flags.26?true invert_media:flags.27?true flags2:# offline:flags2.1?true id:int from_id:flags.8?Peer from_boosts_applied:flags.29?int peer_id:Peer saved_peer_id:flags.28?Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?long via_business_bot_id:flags2.0?long reply_to:flags.3?MessageReplyHeader date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int forwards:flags.10?int replies:flags.23?MessageReplies edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long reactions:flags.20?MessageReactions restriction_reason:flags.22?Vector<RestrictionReason> ttl_period:flags.25?int quick_reply_shortcut_id:flags.30?int = Message;
+message#bde09c2e 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 = 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;
@@ -413,6 +413,7 @@ updateBotNewBusinessMessage#9ddb347c flags:# connection_id:string message:Messag
 updateBotEditBusinessMessage#7df587c flags:# connection_id:string message:Message reply_to_message:flags.0?Message qts:int = Update;
 updateBotDeleteBusinessMessage#a02a982e connection_id:string peer:Peer messages:Vector<int> qts:int = Update;
 updateNewStoryReaction#1824e40b story_id:int peer:Peer reaction:Reaction = Update;
+updateBroadcastRevenueTransactions#dfd961f5 peer:Peer balances:BroadcastRevenueBalances = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -1781,6 +1782,11 @@ reactionsNotifySettings#56e34970 flags:# messages_notify_from:flags.0?ReactionNo
 
 broadcastRevenueBalances#8438f1c6 current_balance:long available_balance:long overall_revenue:long = BroadcastRevenueBalances;
 
+availableEffect#93c3e27e flags:# premium_required:flags.2?true id:long emoticon:string static_icon_id:flags.0?long effect_sticker_id:long effect_animation_id:flags.1?long = AvailableEffect;
+
+messages.availableEffectsNotModified#d1ed9a5b = messages.AvailableEffects;
+messages.availableEffects#bddb616e hash:int effects:Vector<AvailableEffect> documents:Vector<Document> = messages.AvailableEffects;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1791,6 +1797,8 @@ invokeWithoutUpdates#bf9459b7 {X:Type} query:!X = X;
 invokeWithMessagesRange#365275f2 {X:Type} range:MessageRange query:!X = X;
 invokeWithTakeout#aca9fd2e {X:Type} takeout_id:long query:!X = X;
 invokeWithBusinessConnection#dd289f8e {X:Type} connection_id:string query:!X = X;
+invokeWithGooglePlayIntegrity#1df92984 {X:Type} nonce:string token:string query:!X = X;
+invokeWithApnsSecret#dae54f8#8252da54 {X:Type} nonce:string secret:string query:!X = X;
 
 auth.sendCode#a677244f phone_number:string api_id:int api_hash:string settings:CodeSettings = auth.SentCode;
 auth.signUp#aac7b717 flags:# no_joined_notifications:flags.0?true phone_number:string phone_code_hash:string first_name:string last_name:string = auth.Authorization;
@@ -1812,7 +1820,7 @@ auth.importLoginToken#95ac5ce4 token:bytes = auth.LoginToken;
 auth.acceptLoginToken#e894ad4d token:bytes = Authorization;
 auth.checkRecoveryPassword#d36bf79 code:string = Bool;
 auth.importWebTokenAuthorization#2db873a9 api_id:int api_hash:string web_auth_token:string = auth.Authorization;
-auth.requestFirebaseSms#89464b50 flags:# phone_number:string phone_code_hash:string safety_net_token:flags.0?string ios_push_secret:flags.1?string = Bool;
+auth.requestFirebaseSms#73ab08c0 flags:# phone_number:string phone_code_hash:string play_integrity_token:flags.0?string ios_push_secret:flags.1?string = Bool;
 auth.resetLoginEmail#7e960193 phone_number:string phone_code_hash:string = auth.SentCode;
 auth.reportMissingCode#cb9deff6 phone_number:string phone_code_hash:string mnc:string = Bool;
 
@@ -1970,8 +1978,8 @@ 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#dff8042c 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 = Updates;
-messages.sendMedia#7bd66041 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 = 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 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.reportSpam#cf1592db peer:InputPeer = Bool;
 messages.getPeerSettings#efd9a6a2 peer:InputPeer = messages.PeerSettings;
@@ -2050,7 +2058,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#c964709 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 = 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 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>;
@@ -2170,6 +2178,7 @@ messages.deleteQuickReplyMessages#e105e910 shortcut_id:int id:Vector<int> = Upda
 messages.toggleDialogFilterTags#fd2dda49 enabled:Bool = Bool;
 messages.getMyStickers#d0b5e1fc offset_id:long limit:int = messages.MyStickers;
 messages.getEmojiStickerGroups#1dd840f5 hash:int = messages.EmojiGroups;
+messages.getAvailableEffects#dea20a39 hash:int = messages.AvailableEffects;
 
 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;
@@ -2432,4 +2441,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 179
+// LAYER 180
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index b3829efeb41a5..2bbe649f0bc05 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -198,7 +198,8 @@ AdminLog::OwnedItem GenerateForwardedItem(
 		MTPMessageReactions(),
 		MTPVector<MTPRestrictionReason>(),
 		MTPint(), // ttl_period
-		MTPint() // quick_reply_shortcut_id
+		MTPint(), // quick_reply_shortcut_id
+		MTPlong() // effect
 	).match([&](const MTPDmessage &data) {
 		return history->makeMessage(
 			history->nextNonHistoryEntryId(),
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 7648e4543b12b..a4d57f791d2d8 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -135,7 +135,8 @@ void ShareBotGame(
 			MTPVector<MTPMessageEntity>(),
 			MTP_int(0), // schedule_date
 			MTPInputPeer(), // send_as
-			MTPInputQuickReplyShortcut()
+			MTPInputQuickReplyShortcut(),
+			MTPlong()
 		), [=](const MTPUpdates &, const MTP::Response &) {
 	}, [=](const MTP::Error &error, const MTP::Response &) {
 		history->session().api().sendMessageFail(error, history->peer);

From ee4f83ffde3b68aabba4cbb69c5eca82afd899e8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 May 2024 20:47:05 +0400
Subject: [PATCH 168/400] Disable bottom-info reactions view.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 96cbc4648a27a..beaae32f16121 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -3013,6 +3013,8 @@ bool Message::isSignedAuthorElided() const {
 }
 
 bool Message::embedReactionsInBottomInfo() const {
+	return false;
+#if 0 // legacy
 	const auto item = data();
 	const auto user = item->history()->peer->asUser();
 	if (!user
@@ -3045,6 +3047,7 @@ bool Message::embedReactionsInBottomInfo() const {
 		}
 	}
 	return true;
+#endif
 }
 
 bool Message::embedReactionsInBubble() const {

From f7626340366a93337a3abddb27751216d0273ec3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 May 2024 23:34:28 +0400
Subject: [PATCH 169/400] Support effects API, show icon in info.

---
 .../data/data_message_reactions.cpp           | 284 ++++++++++++++----
 .../SourceFiles/data/data_message_reactions.h |  42 ++-
 .../dialogs/dialogs_search_tags.cpp           |   6 +-
 Telegram/SourceFiles/history/history_item.cpp |   4 +-
 .../SourceFiles/history/history_widget.cpp    |   5 +-
 .../history/view/history_view_bottom_info.cpp | 239 +++++----------
 .../history/view/history_view_bottom_info.h   |  43 ++-
 .../view/history_view_context_menu.cpp        |   7 +-
 .../history/view/history_view_element.cpp     |  11 +
 .../history/view/history_view_element.h       |   5 +
 .../history/view/history_view_message.cpp     |  65 +++-
 .../history/view/history_view_message.h       |   4 +
 .../view/reactions/history_view_reactions.cpp |   6 +-
 Telegram/SourceFiles/ui/chat/chat.style       |   2 +
 14 files changed, 437 insertions(+), 286 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index 4dbe1dc875e4f..539c55306a90e 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -264,6 +264,7 @@ Reactions::Reactions(not_null<Session*> owner)
 		kRefreshFullListEach
 	) | rpl::start_with_next([=] {
 		refreshDefault();
+		requestEffects();
 	}, _lifetime);
 
 	_owner->session().changes().messageUpdates(
@@ -343,6 +344,12 @@ void Reactions::refreshTags() {
 	requestTags();
 }
 
+void Reactions::refreshEffects() {
+	if (_effects.empty()) {
+		requestEffects();
+	}
+}
+
 const std::vector<Reaction> &Reactions::list(Type type) const {
 	switch (type) {
 	case Type::Active: return _active;
@@ -352,6 +359,7 @@ const std::vector<Reaction> &Reactions::list(Type type) const {
 	case Type::MyTags:
 		return _myTags.find((SavedSublist*)nullptr)->second.tags;
 	case Type::Tags: return _tags;
+	case Type::Effects: return _effects;
 	}
 	Unexpected("Type in Reactions::list.");
 }
@@ -552,21 +560,45 @@ rpl::producer<ReactionId> Reactions::myTagRenamed() const {
 	return _myTagRenamed.events();
 }
 
+rpl::producer<> Reactions::effectsUpdates() const {
+	return _effectsUpdated.events();
+}
+
+void Reactions::preloadReactionImageFor(const ReactionId &emoji) {
+	if (!emoji.emoji().isEmpty()) {
+		preloadImageFor(emoji);
+	}
+}
+
+void Reactions::preloadEffectImageFor(EffectId id) {
+	preloadImageFor({ DocumentId(id) });
+}
+
 void Reactions::preloadImageFor(const ReactionId &id) {
-	if (_images.contains(id) || id.emoji().isEmpty()) {
+	if (_images.contains(id)) {
 		return;
 	}
 	auto &set = _images.emplace(id).first->second;
-	const auto i = ranges::find(_available, id, &Reaction::id);
-	const auto document = (i == end(_available))
+	set.effect = (id.custom() != 0);
+	const auto i = set.effect
+		? ranges::find(_effects, id, &Reaction::id)
+		: ranges::find(_available, id, &Reaction::id);
+	const auto document = (i == end(set.effect ? _effects : _available))
 		? nullptr
 		: i->centerIcon
 		? i->centerIcon
 		: i->selectAnimation.get();
-	if (document) {
-		loadImage(set, document, !i->centerIcon);
-	} else if (!_waitingForList) {
-		_waitingForList = true;
+	if (document || (set.effect && i != end(_effects))) {
+		if (!set.effect || i->centerIcon) {
+			loadImage(set, document, !i->centerIcon);
+		} else {
+			generateImage(set, i->title);
+		}
+	} else if (set.effect && !_waitingForEffects) {
+		_waitingForEffects = true;
+		refreshEffects();
+	} else if (!set.effect && !_waitingForReactions) {
+		_waitingForReactions = true;
 		refreshDefault();
 	}
 }
@@ -597,14 +629,24 @@ void Reactions::preloadAnimationsFor(const ReactionId &id) {
 	preload(i->aroundAnimation);
 }
 
-QImage Reactions::resolveImageFor(
-		const ReactionId &emoji,
-		ImageSize size) {
-	const auto i = _images.find(emoji);
+QImage Reactions::resolveReactionImageFor(const ReactionId &emoji) {
+	Expects(!emoji.custom());
+
+	return resolveImageFor(emoji);
+}
+
+QImage Reactions::resolveEffectImageFor(EffectId id) {
+	return resolveImageFor({ DocumentId(id) });
+}
+
+QImage Reactions::resolveImageFor(const ReactionId &id) {
+	const auto i = _images.find(id);
 	if (i == end(_images)) {
-		preloadImageFor(emoji);
+		preloadImageFor(id);
 	}
-	auto &set = (i != end(_images)) ? i->second : _images[emoji];
+	auto &set = (i != end(_images)) ? i->second : _images[id];
+	set.effect = (id.custom() != 0);
+
 	const auto resolve = [&](QImage &image, int size) {
 		const auto factor = style::DevicePixelRatio();
 		const auto frameSize = set.fromSelectAnimation
@@ -634,21 +676,18 @@ QImage Reactions::resolveImageFor(
 		}
 		image.setDevicePixelRatio(factor);
 	};
-	if (set.bottomInfo.isNull() && set.icon) {
-		resolve(set.bottomInfo, st::reactionInfoImage);
-		resolve(set.inlineList, st::reactionInlineImage);
+	if (set.image.isNull() && set.icon) {
+		resolve(
+			set.image,
+			set.effect ? st::effectInfoImage : st::reactionInlineImage);
 		crl::async([icon = std::move(set.icon)]{});
 	}
-	switch (size) {
-	case ImageSize::BottomInfo: return set.bottomInfo;
-	case ImageSize::InlineList: return set.inlineList;
-	}
-	Unexpected("ImageSize in Reactions::resolveImageFor.");
+	return set.image;
 }
 
-void Reactions::resolveImages() {
+void Reactions::resolveReactionImages() {
 	for (auto &[id, set] : _images) {
-		if (!set.bottomInfo.isNull() || set.icon || set.media) {
+		if (set.effect || !set.image.isNull() || set.icon || set.media) {
 			continue;
 		}
 		const auto i = ranges::find(_available, id, &Reaction::id);
@@ -666,14 +705,38 @@ void Reactions::resolveImages() {
 	}
 }
 
+void Reactions::resolveEffectImages() {
+	for (auto &[id, set] : _images) {
+		if (!set.effect || !set.image.isNull() || set.icon || set.media) {
+			continue;
+		}
+		const auto i = ranges::find(_effects, id, &Reaction::id);
+		const auto document = (i == end(_effects))
+			? nullptr
+			: i->centerIcon
+			? i->centerIcon
+			: nullptr;
+		if (document) {
+			loadImage(set, document, false);
+		} else if (i != end(_effects)) {
+			generateImage(set, i->title);
+		} else {
+			LOG(("API Error: Effect '%1' not found!"
+				).arg(ReactionIdToLog(id)));
+		}
+	}
+}
+
 void Reactions::loadImage(
 		ImageSet &set,
 		not_null<DocumentData*> document,
 		bool fromSelectAnimation) {
-	if (!set.bottomInfo.isNull() || set.icon) {
+	if (!set.image.isNull() || set.icon) {
 		return;
 	} else if (!set.media) {
-		set.fromSelectAnimation = fromSelectAnimation;
+		if (!set.effect) {
+			set.fromSelectAnimation = fromSelectAnimation;
+		}
 		set.media = document->createMediaView();
 		set.media->checkStickerLarge();
 	}
@@ -687,6 +750,26 @@ void Reactions::loadImage(
 	}
 }
 
+void Reactions::generateImage(ImageSet &set, const QString &emoji) {
+	Expects(set.effect);
+
+	const auto e = Ui::Emoji::Find(emoji);
+	Assert(e != nullptr);
+
+	const auto large = Ui::Emoji::GetSizeLarge();
+	const auto factor = style::DevicePixelRatio();
+	auto image = QImage(large, large, QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(factor);
+	image.fill(Qt::transparent);
+	{
+		QPainter p(&image);
+		Ui::Emoji::Draw(p, e, large, 0, 0);
+	}
+	const auto size = st::effectInfoImage;
+	set.image = image.scaled(size * factor, size * factor);
+	set.image.setDevicePixelRatio(factor);
+}
+
 void Reactions::setAnimatedIcon(ImageSet &set) {
 	const auto size = style::ConvertScale(kSizeForDownscale);
 	set.icon = Ui::MakeAnimatedIcon({
@@ -840,6 +923,25 @@ void Reactions::requestTags() {
 
 }
 
+void Reactions::requestEffects() {
+	if (_effectsRequestId) {
+		return;
+	}
+	auto &api = _owner->session().api();
+	_effectsRequestId = api.request(MTPmessages_GetAvailableEffects(
+		MTP_int(_effectsHash)
+	)).done([=](const MTPmessages_AvailableEffects &result) {
+		_effectsRequestId = 0;
+		result.match([&](const MTPDmessages_availableEffects &data) {
+			updateEffects(data);
+		}, [&](const MTPDmessages_availableEffectsNotModified &) {
+		});
+	}).fail([=] {
+		_effectsRequestId = 0;
+		_effectsHash = 0;
+	}).send();
+}
+
 void Reactions::updateTop(const MTPDmessages_reactions &data) {
 	_topHash = data.vhash().v;
 	_topIds = ListFromMTP(data);
@@ -881,9 +983,9 @@ void Reactions::updateDefault(const MTPDmessages_availableReactions &data) {
 			}
 		}
 	}
-	if (_waitingForList) {
-		_waitingForList = false;
-		resolveImages();
+	if (_waitingForReactions) {
+		_waitingForReactions = false;
+		resolveReactionImages();
 	}
 	defaultUpdated();
 }
@@ -939,6 +1041,32 @@ void Reactions::updateTags(const MTPDmessages_reactions &data) {
 	_tagsUpdated.fire({});
 }
 
+void Reactions::updateEffects(const MTPDmessages_availableEffects &data) {
+	_effectsHash = data.vhash().v;
+
+	const auto &list = data.veffects().v;
+	const auto toCache = [&](DocumentData *document) {
+		if (document) {
+			_iconsCache.emplace(document, document->createMediaView());
+		}
+	};
+	for (const auto &document : data.vdocuments().v) {
+		toCache(_owner->processDocument(document));
+	}
+	_effects.clear();
+	_effects.reserve(list.size());
+	for (const auto &effect : list) {
+		if (const auto parsed = parse(effect)) {
+			_effects.push_back(*parsed);
+		}
+	}
+	if (_waitingForEffects) {
+		_waitingForEffects = false;
+		resolveEffectImages();
+	}
+	effectsUpdated();
+}
+
 void Reactions::recentUpdated() {
 	_topRefreshTimer.callOnce(kTopRequestDelay);
 	_recentUpdated.fire({});
@@ -969,6 +1097,10 @@ void Reactions::tagsUpdated() {
 	_tagsUpdated.fire({});
 }
 
+void Reactions::effectsUpdated() {
+	_effectsUpdated.fire({});
+}
+
 not_null<CustomEmojiManager::Listener*> Reactions::resolveListener() {
 	return static_cast<CustomEmojiManager::Listener*>(this);
 }
@@ -1111,35 +1243,73 @@ void Reactions::resolve(const ReactionId &id) {
 }
 
 std::optional<Reaction> Reactions::parse(const MTPAvailableReaction &entry) {
-	return entry.match([&](const MTPDavailableReaction &data) {
-		const auto emoji = qs(data.vreaction());
-		const auto known = (Ui::Emoji::Find(emoji) != nullptr);
-		if (!known) {
-			LOG(("API Error: Unknown emoji in reactions: %1").arg(emoji));
-		}
-		return known
-			? std::make_optional(Reaction{
-				.id = ReactionId{ emoji },
-				.title = qs(data.vtitle()),
-				//.staticIcon = _owner->processDocument(data.vstatic_icon()),
-				.appearAnimation = _owner->processDocument(
-					data.vappear_animation()),
-				.selectAnimation = _owner->processDocument(
-					data.vselect_animation()),
-				//.activateAnimation = _owner->processDocument(
-				//	data.vactivate_animation()),
-				//.activateEffects = _owner->processDocument(
-				//	data.veffect_animation()),
-				.centerIcon = (data.vcenter_icon()
-					? _owner->processDocument(*data.vcenter_icon()).get()
-					: nullptr),
-				.aroundAnimation = (data.varound_animation()
-					? _owner->processDocument(
-						*data.varound_animation()).get()
-					: nullptr),
-				.active = !data.is_inactive(),
-			})
-			: std::nullopt;
+	const auto &data = entry.data();
+	const auto emoji = qs(data.vreaction());
+	const auto known = (Ui::Emoji::Find(emoji) != nullptr);
+	if (!known) {
+		LOG(("API Error: Unknown emoji in reactions: %1").arg(emoji));
+		return std::nullopt;
+	}
+	return std::make_optional(Reaction{
+		.id = ReactionId{ emoji },
+		.title = qs(data.vtitle()),
+		//.staticIcon = _owner->processDocument(data.vstatic_icon()),
+		.appearAnimation = _owner->processDocument(
+			data.vappear_animation()),
+		.selectAnimation = _owner->processDocument(
+			data.vselect_animation()),
+		//.activateAnimation = _owner->processDocument(
+		//	data.vactivate_animation()),
+		//.activateEffects = _owner->processDocument(
+		//	data.veffect_animation()),
+		.centerIcon = (data.vcenter_icon()
+			? _owner->processDocument(*data.vcenter_icon()).get()
+			: nullptr),
+		.aroundAnimation = (data.varound_animation()
+			? _owner->processDocument(*data.varound_animation()).get()
+			: nullptr),
+		.active = !data.is_inactive(),
+	});
+}
+
+std::optional<Reaction> Reactions::parse(const MTPAvailableEffect &entry) {
+	const auto &data = entry.data();
+	const auto emoji = qs(data.vemoticon());
+	const auto known = (Ui::Emoji::Find(emoji) != nullptr);
+	if (!known) {
+		LOG(("API Error: Unknown emoji in effects: %1").arg(emoji));
+		return std::nullopt;
+	}
+	const auto id = DocumentId(data.vid().v);
+	const auto document = _owner->document(id);
+	if (!document->sticker()) {
+		LOG(("API Error: Bad sticker in effects: %1").arg(id));
+		return std::nullopt;
+	}
+	const auto aroundId = data.veffect_animation_id().value_or_empty();
+	const auto around = aroundId
+		? _owner->document(aroundId).get()
+		: nullptr;
+	if (around && !around->sticker()) {
+		LOG(("API Error: Bad sticker in effects around: %1").arg(aroundId));
+		return std::nullopt;
+	}
+	const auto iconId = data.vstatic_icon_id().value_or_empty();
+	const auto icon = iconId ? _owner->document(iconId).get() : nullptr;
+	if (icon && !icon->sticker()) {
+		LOG(("API Error: Bad sticker in effects icon: %1").arg(iconId));
+		return std::nullopt;
+	}
+	return std::make_optional(Reaction{
+		.id = ReactionId{ id },
+		.title = emoji,
+		.appearAnimation = document,
+		.selectAnimation = document,
+		.centerIcon = icon,
+		.aroundAnimation = around,
+		.active = true,
+		.effect = true,
+		.premium = data.is_premium_required(),
 	});
 }
 
diff --git a/Telegram/SourceFiles/data/data_message_reactions.h b/Telegram/SourceFiles/data/data_message_reactions.h
index 9d67e2e2cf2fd..755b1c4d27a6e 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.h
+++ b/Telegram/SourceFiles/data/data_message_reactions.h
@@ -37,6 +37,8 @@ struct Reaction {
 	DocumentData *aroundAnimation = nullptr;
 	int count = 0;
 	bool active = false;
+	bool effect = false;
+	bool premium = false;
 };
 
 struct PossibleItemReactionsRef {
@@ -80,6 +82,7 @@ class Reactions final : private CustomEmojiManager::Listener {
 	void refreshMyTags(SavedSublist *sublist = nullptr);
 	void refreshMyTagsDelayed();
 	void refreshTags();
+	void refreshEffects();
 
 	enum class Type {
 		Active,
@@ -88,6 +91,7 @@ class Reactions final : private CustomEmojiManager::Listener {
 		All,
 		MyTags,
 		Tags,
+		Effects,
 	};
 	[[nodiscard]] const std::vector<Reaction> &list(Type type) const;
 	[[nodiscard]] const std::vector<MyTagInfo> &myTagsInfo() const;
@@ -108,16 +112,15 @@ class Reactions final : private CustomEmojiManager::Listener {
 	[[nodiscard]] rpl::producer<> myTagsUpdates() const;
 	[[nodiscard]] rpl::producer<> tagsUpdates() const;
 	[[nodiscard]] rpl::producer<ReactionId> myTagRenamed() const;
+	[[nodiscard]] rpl::producer<> effectsUpdates() const;
+
+	void preloadReactionImageFor(const ReactionId &emoji);
+	[[nodiscard]] QImage resolveReactionImageFor(const ReactionId &emoji);
+
+	void preloadEffectImageFor(EffectId id);
+	[[nodiscard]] QImage resolveEffectImageFor(EffectId id);
 
-	enum class ImageSize {
-		BottomInfo,
-		InlineList,
-	};
-	void preloadImageFor(const ReactionId &emoji);
 	void preloadAnimationsFor(const ReactionId &emoji);
-	[[nodiscard]] QImage resolveImageFor(
-		const ReactionId &emoji,
-		ImageSize size);
 
 	void send(not_null<HistoryItem*> item, bool addToRecent);
 	[[nodiscard]] bool sending(not_null<HistoryItem*> item) const;
@@ -139,11 +142,11 @@ class Reactions final : private CustomEmojiManager::Listener {
 
 private:
 	struct ImageSet {
-		QImage bottomInfo;
-		QImage inlineList;
+		QImage image;
 		std::shared_ptr<DocumentMedia> media;
 		std::unique_ptr<Ui::AnimatedIcon> icon;
 		bool fromSelectAnimation = false;
+		bool effect = false;
 	};
 	struct TagsBySublist {
 		TagsBySublist() = default;
@@ -169,6 +172,7 @@ class Reactions final : private CustomEmojiManager::Listener {
 	void requestGeneric();
 	void requestMyTags(SavedSublist *sublist = nullptr);
 	void requestTags();
+	void requestEffects();
 
 	void updateTop(const MTPDmessages_reactions &data);
 	void updateRecent(const MTPDmessages_reactions &data);
@@ -178,11 +182,13 @@ class Reactions final : private CustomEmojiManager::Listener {
 		SavedSublist *sublist,
 		const MTPDmessages_savedReactionTags &data);
 	void updateTags(const MTPDmessages_reactions &data);
+	void updateEffects(const MTPDmessages_availableEffects &data);
 
 	void recentUpdated();
 	void defaultUpdated();
 	void myTagsUpdated();
 	void tagsUpdated();
+	void effectsUpdated();
 
 	[[nodiscard]] std::optional<Reaction> resolveById(const ReactionId &id);
 	[[nodiscard]] std::vector<Reaction> resolveByIds(
@@ -203,13 +209,19 @@ class Reactions final : private CustomEmojiManager::Listener {
 
 	[[nodiscard]] std::optional<Reaction> parse(
 		const MTPAvailableReaction &entry);
+	[[nodiscard]] std::optional<Reaction> parse(
+		const MTPAvailableEffect &entry);
 
+	void preloadImageFor(const ReactionId &id);
+	[[nodiscard]] QImage resolveImageFor(const ReactionId &id);
 	void loadImage(
 		ImageSet &set,
 		not_null<DocumentData*> document,
 		bool fromSelectAnimation);
+	void generateImage(ImageSet &set, const QString &emoji);
 	void setAnimatedIcon(ImageSet &set);
-	void resolveImages();
+	void resolveReactionImages();
+	void resolveEffectImages();
 	void downloadTaskFinished();
 
 	void repaintCollected();
@@ -233,6 +245,7 @@ class Reactions final : private CustomEmojiManager::Listener {
 	std::vector<ReactionId> _topIds;
 	base::flat_set<ReactionId> _unresolvedTop;
 	std::vector<not_null<DocumentData*>> _genericAnimations;
+	std::vector<Reaction> _effects;
 	ReactionId _favoriteId;
 	ReactionId _unresolvedFavoriteId;
 	std::optional<Reaction> _favorite;
@@ -249,6 +262,7 @@ class Reactions final : private CustomEmojiManager::Listener {
 	rpl::event_stream<SavedSublist*> _myTagsUpdated;
 	rpl::event_stream<> _tagsUpdated;
 	rpl::event_stream<ReactionId> _myTagRenamed;
+	rpl::event_stream<> _effectsUpdated;
 
 	// We need &i->second stay valid while inserting new items.
 	// So we use std::map instead of base::flat_map here.
@@ -271,9 +285,13 @@ class Reactions final : private CustomEmojiManager::Listener {
 	mtpRequestId _tagsRequestId = 0;
 	uint64 _tagsHash = 0;
 
+	mtpRequestId _effectsRequestId = 0;
+	int32 _effectsHash = 0;
+
 	base::flat_map<ReactionId, ImageSet> _images;
 	rpl::lifetime _imagesLoadLifetime;
-	bool _waitingForList = false;
+	bool _waitingForReactions = false;
+	bool _waitingForEffects = false;
 
 	base::flat_map<FullMsgId, mtpRequestId> _sentRequests;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
index 276d4e5b69871..c7e85c94e7af6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
@@ -168,7 +168,7 @@ void SearchTags::fill(
 			.selected = ranges::contains(selected, id),
 		});
 		if (!customId) {
-			_owner->reactions().preloadImageFor(id);
+			_owner->reactions().preloadReactionImageFor(id);
 		}
 	};
 	if (!premium) {
@@ -335,9 +335,7 @@ void SearchTags::paint(
 		paintBackground(p, geometry, tag);
 		paintText(p, geometry, tag);
 		if (!tag.custom && !tag.promo && tag.image.isNull()) {
-			tag.image = _owner->reactions().resolveImageFor(
-				tag.id,
-				::Data::Reactions::ImageSize::InlineList);
+			tag.image = _owner->reactions().resolveReactionImageFor(tag.id);
 		}
 		const auto inner = geometry.marginsRemoved(padding);
 		const auto image = QRect(
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 4326bed57f2ca..b65173f0010c4 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -365,6 +365,7 @@ HistoryItem::HistoryItem(
 	.from = data.vfrom_id() ? peerFromMTP(*data.vfrom_id()) : PeerId(0),
 	.date = data.vdate().v,
 	.shortcutId = data.vquick_reply_shortcut_id().value_or_empty(),
+	.effectId = data.veffect().value_or_empty(),
 }) {
 	_boostsApplied = data.vfrom_boosts_applied().value_or_empty();
 
@@ -681,7 +682,8 @@ HistoryItem::HistoryItem(
 	: history->peer)
 , _flags(FinalizeMessageFlags(history, fields.flags))
 , _date(fields.date)
-, _shortcutId(fields.shortcutId) {
+, _shortcutId(fields.shortcutId)
+, _effectId(fields.effectId) {
 	if (isHistoryEntry() && IsClientMsgId(id)) {
 		_history->registerClientSideMessage(this);
 	}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 029da2623aac2..ce14ce6205c13 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -74,6 +74,7 @@ For license and copyright information please follow this link:
 #include "data/data_file_origin.h"
 #include "data/data_histories.h"
 #include "data/data_group_call.h"
+#include "data/data_message_reactions.h"
 #include "data/data_peer_values.h" // Data::AmPremiumValue.
 #include "data/data_premium_limits.h" // Data::PremiumLimits.
 #include "data/stickers/data_stickers.h"
@@ -1398,7 +1399,7 @@ int HistoryWidget::itemTopForHighlight(
 	if (heightLeft >= 0) {
 		return std::max(itemTop - (heightLeft / 2), 0);
 	} else if (reactionCenter >= 0) {
-		const auto maxSize = st::reactionInfoImage;
+		const auto maxSize = st::reactionInlineImage;
 
 		// Show message right till the bottom.
 		const auto forBottom = itemTop + viewHeight - visibleAreaHeight;
@@ -2375,6 +2376,8 @@ void HistoryWidget::showHistory(
 			}
 		}
 
+		session().data().reactions().refreshEffects();
+
 		_scroll->hide();
 		_list = _scroll->setOwnedWidget(
 			object_ptr<HistoryInner>(this, _scroll, controller(), _history));
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index a4000efe1c681..db8f49a2702c8 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -30,14 +30,10 @@ For license and copyright information please follow this link:
 
 namespace HistoryView {
 
-struct BottomInfo::Reaction {
+struct BottomInfo::Effect {
 	mutable std::unique_ptr<Ui::ReactionFlyAnimation> animation;
 	mutable QImage image;
-	ReactionId id;
-	QString countText;
-	int count = 0;
-	int countTextWidth = 0;
-	bool chosen = false;
+	EffectId id = 0;
 };
 
 BottomInfo::BottomInfo(
@@ -58,17 +54,11 @@ void BottomInfo::update(Data &&data, int availableWidth) {
 	}
 }
 
-int BottomInfo::countReactionsMaxWidth() const {
+int BottomInfo::countEffectMaxWidth() const {
 	auto result = 0;
-	for (const auto &reaction : _reactions) {
+	if (_effect) {
 		result += st::reactionInfoSize;
-		if (reaction.countTextWidth > 0) {
-			result += st::reactionInfoSkip
-				+ reaction.countTextWidth
-				+ st::reactionInfoDigitSkip;
-		} else {
-			result += st::reactionInfoBetween;
-		}
+		result += st::reactionInfoBetween;
 	}
 	if (result) {
 		result += (st::reactionInfoSkip - st::reactionInfoBetween);
@@ -76,19 +66,14 @@ int BottomInfo::countReactionsMaxWidth() const {
 	return result;
 }
 
-int BottomInfo::countReactionsHeight(int newWidth) const {
+int BottomInfo::countEffectHeight(int newWidth) const {
 	const auto left = 0;
 	auto x = 0;
 	auto y = 0;
 	auto widthLeft = newWidth;
-	for (const auto &reaction : _reactions) {
-		const auto add = (reaction.countTextWidth > 0)
-			? st::reactionInfoDigitSkip
-			: st::reactionInfoBetween;
-		const auto width = st::reactionInfoSize
-			+ (reaction.countTextWidth > 0
-				? (st::reactionInfoSkip + reaction.countTextWidth)
-				: 0);
+	if (_effect) {
+		const auto add = st::reactionInfoBetween;
+		const auto width = st::reactionInfoSize;
 		if (x > left && widthLeft < width) {
 			x = left;
 			y += st::msgDateFont->height;
@@ -107,7 +92,7 @@ int BottomInfo::firstLineWidth() const {
 	if (height() == minHeight()) {
 		return width();
 	}
-	return maxWidth() - _reactionsMaxWidth;
+	return maxWidth() - _effectMaxWidth;
 }
 
 bool BottomInfo::isWide() const {
@@ -115,14 +100,14 @@ bool BottomInfo::isWide() const {
 		|| !_data.author.isEmpty()
 		|| !_views.isEmpty()
 		|| !_replies.isEmpty()
-		|| !_reactions.empty();
+		|| _effect;
 }
 
 TextState BottomInfo::textState(
 		not_null<const HistoryItem*> item,
 		QPoint position) const {
 	auto result = TextState(item);
-	if (const auto link = revokeReactionLink(item, position)) {
+	if (const auto link = replayEffectLink(item, position)) {
 		result.link = link;
 		return result;
 	}
@@ -172,32 +157,26 @@ TextState BottomInfo::textState(
 	return result;
 }
 
-ClickHandlerPtr BottomInfo::revokeReactionLink(
+ClickHandlerPtr BottomInfo::replayEffectLink(
 		not_null<const HistoryItem*> item,
 		QPoint position) const {
-	if (_reactions.empty()) {
+	if (!_effect) {
 		return nullptr;
 	}
 	auto left = 0;
 	auto top = 0;
 	auto available = width();
 	if (height() != minHeight()) {
-		available = std::min(available, _reactionsMaxWidth);
+		available = std::min(available, _effectMaxWidth);
 		left += width() - available;
 		top += st::msgDateFont->height;
 	}
 	auto x = left;
 	auto y = top;
 	auto widthLeft = available;
-	for (const auto &reaction : _reactions) {
-		const auto chosen = reaction.chosen;
-		const auto add = (reaction.countTextWidth > 0)
-			? st::reactionInfoDigitSkip
-			: st::reactionInfoBetween;
-		const auto width = st::reactionInfoSize
-			+ (reaction.countTextWidth > 0
-				? (st::reactionInfoSkip + reaction.countTextWidth)
-				: 0);
+	if (_effect) {
+		const auto add = st::reactionInfoBetween;
+		const auto width = st::reactionInfoSize;
 		if (x > left && widthLeft < width) {
 			x = left;
 			y += st::msgDateFont->height;
@@ -208,11 +187,11 @@ ClickHandlerPtr BottomInfo::revokeReactionLink(
 			y,
 			st::reactionInfoSize,
 			st::msgDateFont->height);
-		if (chosen && image.contains(position)) {
-			if (!_revokeLink) {
-				_revokeLink = revokeReactionLink(item);
+		if (image.contains(position)) {
+			if (!_replayLink) {
+				_replayLink = replayEffectLink(item);
 			}
-			return _revokeLink;
+			return _replayLink;
 		}
 		x += width + add;
 		widthLeft -= width + add;
@@ -220,25 +199,16 @@ ClickHandlerPtr BottomInfo::revokeReactionLink(
 	return nullptr;
 }
 
-ClickHandlerPtr BottomInfo::revokeReactionLink(
+ClickHandlerPtr BottomInfo::replayEffectLink(
 		not_null<const HistoryItem*> item) const {
 	const auto itemId = item->fullId();
 	const auto sessionId = item->history()->session().uniqueId();
 	return std::make_shared<LambdaClickHandler>([=](
-			ClickContext context) {
+		ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
 		if (const auto controller = my.sessionWindow.get()) {
-			if (controller->session().uniqueId() == sessionId) {
-				auto &owner = controller->session().data();
-				if (const auto item = owner.message(itemId)) {
-					const auto chosen = item->chosenReactions();
-					if (!chosen.empty()) {
-						item->toggleReaction(
-							chosen.front(),
-							HistoryItem::ReactionSource::Existing);
-					}
-				}
-			}
+			controller->showToast("playing nice effect..");
+			AssertIsDebug();
 		}
 	});
 }
@@ -340,20 +310,20 @@ void BottomInfo::paint(
 			firstLineBottom + st::historyViewsTop,
 			outerWidth);
 	}
-	if (!_reactions.empty()) {
+	if (_effect) {
 		auto left = position.x();
 		auto top = position.y();
 		auto available = width();
 		if (height() != minHeight()) {
-			available = std::min(available, _reactionsMaxWidth);
+			available = std::min(available, _effectMaxWidth);
 			left += width() - available;
 			top += st::msgDateFont->height;
 		}
-		paintReactions(p, position, left, top, available, context);
+		paintEffect(p, position, left, top, available, context);
 	}
 }
 
-void BottomInfo::paintReactions(
+void BottomInfo::paintEffect(
 		Painter &p,
 		QPoint origin,
 		int left,
@@ -369,52 +339,33 @@ void BottomInfo::paintReactions(
 	auto x = left;
 	auto y = top;
 	auto widthLeft = availableWidth;
-	for (const auto &reaction : _reactions) {
-		if (context.reactionInfo
-			&& reaction.animation
-			&& reaction.animation->finished()) {
-			reaction.animation = nullptr;
-		}
-		const auto animating = (reaction.animation != nullptr);
-		const auto add = (reaction.countTextWidth > 0)
-			? st::reactionInfoDigitSkip
-			: st::reactionInfoBetween;
-		const auto width = st::reactionInfoSize
-			+ (reaction.countTextWidth > 0
-				? (st::reactionInfoSkip + reaction.countTextWidth)
-				: 0);
+	if (_effect) {
+		const auto animating = (_effect->animation != nullptr);
+		const auto add = st::reactionInfoBetween;
+		const auto width = st::reactionInfoSize;
 		if (x > left && widthLeft < width) {
 			x = left;
 			y += st::msgDateFont->height;
 			widthLeft = availableWidth;
 		}
-		if (reaction.image.isNull()) {
-			reaction.image = _reactionsOwner->resolveImageFor(
-				reaction.id,
-				::Data::Reactions::ImageSize::BottomInfo);
+		if (_effect->image.isNull()) {
+			_effect->image = _reactionsOwner->resolveEffectImageFor(
+				_effect->id);
 		}
 		const auto image = QRect(
-			x + (st::reactionInfoSize - st::reactionInfoImage) / 2,
-			y + (st::msgDateFont->height - st::reactionInfoImage) / 2,
-			st::reactionInfoImage,
-			st::reactionInfoImage);
-		const auto skipImage = animating
-			&& (reaction.count < 2 || !reaction.animation->flying());
-		if (!reaction.image.isNull() && !skipImage) {
-			p.drawImage(image.topLeft(), reaction.image);
+			x + (st::reactionInfoSize - st::effectInfoImage) / 2,
+			y + (st::msgDateFont->height - st::effectInfoImage) / 2,
+			st::effectInfoImage,
+			st::effectInfoImage);
+		if (!_effect->image.isNull()) {
+			p.drawImage(image.topLeft(), _effect->image);
 		}
 		if (animating) {
 			animations.push_back({
-				.animation = reaction.animation.get(),
+				.animation = _effect->animation.get(),
 				.target = image,
 			});
 		}
-		if (reaction.countTextWidth > 0) {
-			p.drawText(
-				x + st::reactionInfoSize + st::reactionInfoSkip,
-				y + st::msgDateFont->ascent,
-				reaction.countText);
-		}
 		x += width + add;
 		widthLeft -= width + add;
 	}
@@ -448,18 +399,18 @@ QSize BottomInfo::countCurrentSize(int newWidth) {
 	const auto dateHeight = (_data.flags & Data::Flag::Sponsored)
 		? 0
 		: st::msgDateFont->height;
-	const auto noReactionsWidth = maxWidth() - _reactionsMaxWidth;
-	accumulate_min(newWidth, std::max(noReactionsWidth, _reactionsMaxWidth));
+	const auto noReactionsWidth = maxWidth() - _effectMaxWidth;
+	accumulate_min(newWidth, std::max(noReactionsWidth, _effectMaxWidth));
 	return QSize(
 		newWidth,
-		dateHeight + countReactionsHeight(newWidth));
+		dateHeight + countEffectHeight(newWidth));
 }
 
 void BottomInfo::layout() {
 	layoutDateText();
 	layoutViewsText();
 	layoutRepliesText();
-	layoutReactionsText();
+	layoutEffectText();
 	initDimensions();
 }
 
@@ -520,33 +471,12 @@ void BottomInfo::layoutRepliesText() {
 		Ui::NameTextOptions());
 }
 
-void BottomInfo::layoutReactionsText() {
-	if (_data.reactions.empty()) {
-		_reactions.clear();
+void BottomInfo::layoutEffectText() {
+	if (!_data.effectId) {
+		_effect = nullptr;
 		return;
 	}
-	auto sorted = ranges::views::all(
-		_data.reactions
-	) | ranges::views::transform([](const MessageReaction &reaction) {
-		return not_null{ &reaction };
-	}) | ranges::to_vector;
-	ranges::sort(
-		sorted,
-		std::greater<>(),
-		&MessageReaction::count);
-
-	auto reactions = std::vector<Reaction>();
-	reactions.reserve(sorted.size());
-	for (const auto &reaction : sorted) {
-		const auto &id = reaction->id;
-		const auto i = ranges::find(_reactions, id, &Reaction::id);
-		reactions.push_back((i != end(_reactions))
-			? std::move(*i)
-			: prepareReactionWithId(id));
-		reactions.back().chosen = reaction->my;
-		setReactionCount(reactions.back(), reaction->count);
-	}
-	_reactions = std::move(reactions);
+	_effect = std::make_unique<Effect>(prepareEffectWithId(_data.effectId));
 }
 
 QSize BottomInfo::countOptimalSize() {
@@ -571,69 +501,42 @@ QSize BottomInfo::countOptimalSize() {
 	if (_data.flags & Data::Flag::Pinned) {
 		width += st::historyPinWidth;
 	}
-	_reactionsMaxWidth = countReactionsMaxWidth();
-	width += _reactionsMaxWidth;
+	_effectMaxWidth = countEffectMaxWidth();
+	width += _effectMaxWidth;
 	const auto dateHeight = (_data.flags & Data::Flag::Sponsored)
 		? 0
 		: st::msgDateFont->height;
 	return QSize(width, dateHeight);
 }
 
-BottomInfo::Reaction BottomInfo::prepareReactionWithId(
-		const ReactionId &id) {
-	auto result = Reaction{ .id = id };
-	_reactionsOwner->preloadImageFor(id);
+BottomInfo::Effect BottomInfo::prepareEffectWithId(EffectId id) {
+	auto result = Effect{ .id = id };
+	_reactionsOwner->preloadEffectImageFor(id);
 	return result;
 }
 
-void BottomInfo::setReactionCount(Reaction &reaction, int count) {
-	if (reaction.count == count) {
-		return;
-	}
-	reaction.count = count;
-	reaction.countText = (count > 1)
-		? Lang::FormatCountToShort(count).string
-		: QString();
-	reaction.countTextWidth = (count > 1)
-		? st::msgDateFont->width(reaction.countText)
-		: 0;
-}
-
-void BottomInfo::animateReaction(
-	Ui::ReactionFlyAnimationArgs &&args,
+void BottomInfo::animateEffect(
+		Ui::ReactionFlyAnimationArgs &&args,
 		Fn<void()> repaint) {
-	const auto i = ranges::find(_reactions, args.id, &Reaction::id);
-	if (i == end(_reactions)) {
+	if (!_effect || args.id.custom() != _effect->id) {
 		return;
 	}
-	i->animation = std::make_unique<Ui::ReactionFlyAnimation>(
+	_effect->animation = std::make_unique<Ui::ReactionFlyAnimation>(
 		_reactionsOwner,
 		args.translated(QPoint(width(), height())),
 		std::move(repaint),
-		st::reactionInfoImage);
+		st::effectInfoImage);
 }
 
-auto BottomInfo::takeReactionAnimations()
--> base::flat_map<ReactionId, std::unique_ptr<Ui::ReactionFlyAnimation>> {
-	auto result = base::flat_map<
-		ReactionId,
-		std::unique_ptr<Ui::ReactionFlyAnimation>>();
-	for (auto &reaction : _reactions) {
-		if (reaction.animation) {
-			result.emplace(reaction.id, std::move(reaction.animation));
-		}
-	}
-	return result;
+auto BottomInfo::takeEffectAnimation()
+-> std::unique_ptr<Ui::ReactionFlyAnimation> {
+	return _effect ? std::move(_effect->animation) : nullptr;
 }
 
-void BottomInfo::continueReactionAnimations(base::flat_map<
-		ReactionId,
-		std::unique_ptr<Ui::ReactionFlyAnimation>> animations) {
-	for (auto &[id, animation] : animations) {
-		const auto i = ranges::find(_reactions, id, &Reaction::id);
-		if (i != end(_reactions)) {
-			i->animation = std::move(animation);
-		}
+void BottomInfo::continueEffectAnimation(
+		std::unique_ptr<Ui::ReactionFlyAnimation> animation) {
+	if (_effect) {
+		_effect->animation = std::move(animation);
 	}
 }
 
@@ -643,9 +546,7 @@ BottomInfo::Data BottomInfoDataFromMessage(not_null<Message*> message) {
 
 	auto result = BottomInfo::Data();
 	result.date = message->dateTime();
-	if (message->embedReactionsInBottomInfo()) {
-		result.reactions = item->reactions();
-	}
+	result.effectId = item->effectId();
 	if (message->hasOutLayout()) {
 		result.flags |= Flag::OutLayout;
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.h b/Telegram/SourceFiles/history/view/history_view_bottom_info.h
index efdab33347f2a..b4cc26f51167c 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.h
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.h
@@ -20,8 +20,6 @@ class ReactionFlyAnimation;
 
 namespace Data {
 class Reactions;
-struct ReactionId;
-struct MessageReaction;
 } // namespace Data
 
 namespace HistoryView {
@@ -33,8 +31,6 @@ struct TextState;
 
 class BottomInfo final : public Object {
 public:
-	using ReactionId = ::Data::ReactionId;
-	using MessageReaction = ::Data::MessageReaction;
 	struct Data {
 		enum class Flag : uchar {
 			Edited         = 0x01,
@@ -52,7 +48,7 @@ class BottomInfo final : public Object {
 
 		QDateTime date;
 		QString author;
-		std::vector<MessageReaction> reactions;
+		EffectId effectId = 0;
 		std::optional<int> views;
 		std::optional<int> replies;
 		std::optional<int> forwardsCount;
@@ -78,29 +74,26 @@ class BottomInfo final : public Object {
 		bool inverted,
 		const PaintContext &context) const;
 
-	void animateReaction(
+	void animateEffect(
 		Ui::ReactionFlyAnimationArgs &&args,
 		Fn<void()> repaint);
-	[[nodiscard]] auto takeReactionAnimations()
-		-> base::flat_map<
-			ReactionId,
-			std::unique_ptr<Ui::ReactionFlyAnimation>>;
-	void continueReactionAnimations(base::flat_map<
-		ReactionId,
-		std::unique_ptr<Ui::ReactionFlyAnimation>> animations);
+	[[nodiscard]] auto takeEffectAnimation()
+		-> std::unique_ptr<Ui::ReactionFlyAnimation>;
+	void continueEffectAnimation(
+		std::unique_ptr<Ui::ReactionFlyAnimation> animation);
 
 private:
-	struct Reaction;
+	struct Effect;
 
 	void layout();
 	void layoutDateText();
 	void layoutViewsText();
 	void layoutRepliesText();
-	void layoutReactionsText();
+	void layoutEffectText();
 
-	[[nodiscard]] int countReactionsMaxWidth() const;
-	[[nodiscard]] int countReactionsHeight(int newWidth) const;
-	void paintReactions(
+	[[nodiscard]] int countEffectMaxWidth() const;
+	[[nodiscard]] int countEffectHeight(int newWidth) const;
+	void paintEffect(
 		Painter &p,
 		QPoint origin,
 		int left,
@@ -111,13 +104,11 @@ class BottomInfo final : public Object {
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
 
-	void setReactionCount(Reaction &reaction, int count);
-	[[nodiscard]] Reaction prepareReactionWithId(
-		const ReactionId &id);
-	[[nodiscard]] ClickHandlerPtr revokeReactionLink(
+	[[nodiscard]] Effect prepareEffectWithId(EffectId id);
+	[[nodiscard]] ClickHandlerPtr replayEffectLink(
 		not_null<const HistoryItem*> item,
 		QPoint position) const;
-	[[nodiscard]] ClickHandlerPtr revokeReactionLink(
+	[[nodiscard]] ClickHandlerPtr replayEffectLink(
 		not_null<const HistoryItem*> item) const;
 
 	const not_null<::Data::Reactions*> _reactionsOwner;
@@ -125,9 +116,9 @@ class BottomInfo final : public Object {
 	Ui::Text::String _authorEditedDate;
 	Ui::Text::String _views;
 	Ui::Text::String _replies;
-	std::vector<Reaction> _reactions;
-	mutable ClickHandlerPtr _revokeLink;
-	int _reactionsMaxWidth = 0;
+	std::unique_ptr<Effect> _effect;
+	mutable ClickHandlerPtr _replayLink;
+	int _effectMaxWidth = 0;
 	bool _authorElided = false;
 
 };
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 559a98ccdbab0..88d9ad1835bd9 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1038,7 +1038,7 @@ void EditTagBox(
 			customId,
 			[=] { field->update(); });
 	} else {
-		owner->reactions().preloadImageFor(id);
+		owner->reactions().preloadReactionImageFor(id);
 	}
 	field->paintRequest() | rpl::start_with_next([=](QRect clip) {
 		auto p = QPainter(field);
@@ -1053,9 +1053,8 @@ void EditTagBox(
 			});
 		} else {
 			if (state->image.isNull()) {
-				state->image = owner->reactions().resolveImageFor(
-					id,
-					::Data::Reactions::ImageSize::InlineList);
+				state->image = owner->reactions().resolveReactionImageFor(
+					id);
 			}
 			if (!state->image.isNull()) {
 				const auto size = st::reactionInlineSize;
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index e687ec9211ac7..79fc506c14b65 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -1770,6 +1770,17 @@ auto Element::takeReactionAnimations()
 	return {};
 }
 
+void Element::animateEffect(Ui::ReactionFlyAnimationArgs &&args) {
+}
+
+void Element::animateUnreadEffect() {
+}
+
+auto Element::takeEffectAnimation()
+-> std::unique_ptr<Ui::ReactionFlyAnimation> {
+	return nullptr;
+}
+
 Element::~Element() {
 	// Delete media while owner still exists.
 	clearSpecialOnlyEmoji();
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index a11d0831dd3b9..4316806ce28b9 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -545,6 +545,11 @@ class Element
 		Data::ReactionId,
 		std::unique_ptr<Ui::ReactionFlyAnimation>>;
 
+	virtual void animateEffect(Ui::ReactionFlyAnimationArgs &&args);
+	void animateUnreadEffect();
+	[[nodiscard]] virtual auto takeEffectAnimation()
+	-> std::unique_ptr<Ui::ReactionFlyAnimation>;
+
 	void overrideMedia(std::unique_ptr<Media> media);
 
 	virtual bool consumeHorizontalScroll(QPoint position, int delta) {
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index beaae32f16121..ea17702ee4499 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -423,6 +423,7 @@ Message::Message(
 		: base::flat_map<
 			Data::ReactionId,
 			std::unique_ptr<Ui::ReactionFlyAnimation>>();
+	auto animation = replacing ? replacing->takeEffectAnimation() : nullptr;
 	if (!animations.empty()) {
 		const auto repainter = [=] { repaint(); };
 		for (const auto &[id, animation] : animations) {
@@ -430,10 +431,11 @@ Message::Message(
 		}
 		if (_reactions) {
 			_reactions->continueAnimations(std::move(animations));
-		} else {
-			_bottomInfo.continueReactionAnimations(std::move(animations));
 		}
 	}
+	if (animation) {
+		_bottomInfo.continueEffectAnimation(std::move(animation));
+	}
 	if (data->isSponsored()) {
 		const auto &session = data->history()->session();
 		const auto details = session.sponsoredMessages().lookupDetails(
@@ -582,9 +584,6 @@ void Message::animateReaction(Ui::ReactionFlyAnimationArgs &&args) {
 		return;
 	}
 
-	const auto animateInBottomInfo = [&](QPoint bottomRight) {
-		_bottomInfo.animateReaction(args.translated(-bottomRight), repainter);
-	};
 	if (bubble) {
 		auto entry = logEntryOriginal();
 
@@ -609,6 +608,50 @@ void Message::animateReaction(Ui::ReactionFlyAnimationArgs &&args) {
 			_reactions->animate(args.translated(-reactionsPosition), repainter);
 			return;
 		}
+	}
+}
+
+void Message::animateEffect(Ui::ReactionFlyAnimationArgs &&args) {
+	const auto item = data();
+	const auto media = this->media();
+
+	auto g = countGeometry();
+	if (g.width() < 1 || isHidden()) {
+		return;
+	}
+	const auto repainter = [=] { repaint(); };
+
+	const auto bubble = drawBubble();
+	const auto reactionsInBubble = _reactions && embedReactionsInBubble();
+	const auto mediaDisplayed = media && media->isDisplayed();
+	const auto keyboard = item->inlineReplyKeyboard();
+	auto keyboardHeight = 0;
+	if (keyboard) {
+		keyboardHeight = keyboard->naturalHeight();
+		g.setHeight(g.height() - st::msgBotKbButton.margin - keyboardHeight);
+	}
+
+	const auto animateInBottomInfo = [&](QPoint bottomRight) {
+		_bottomInfo.animateEffect(args.translated(-bottomRight), repainter);
+	};
+	if (bubble) {
+		auto entry = logEntryOriginal();
+
+		// Entry page is always a bubble bottom.
+		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
+
+		auto inner = g;
+		if (_comments) {
+			inner.setHeight(inner.height() - st::historyCommentsButtonHeight);
+		}
+		auto trect = inner.marginsRemoved(st::msgPadding);
+		const auto reactionsTop = (reactionsInBubble && !_viewButton)
+			? st::mediaInBubbleSkip
+			: 0;
+		const auto reactionsHeight = reactionsInBubble
+			? (reactionsTop + _reactions->height())
+			: 0;
 		if (_viewButton) {
 			const auto belowInfo = _viewButton->belowMessageInfo();
 			const auto infoHeight = reactionsInBubble
@@ -653,9 +696,15 @@ auto Message::takeReactionAnimations()
 -> base::flat_map<
 		Data::ReactionId,
 		std::unique_ptr<Ui::ReactionFlyAnimation>> {
-	return _reactions
-		? _reactions->takeAnimations()
-		: _bottomInfo.takeReactionAnimations();
+	if (_reactions) {
+		return _reactions->takeAnimations();
+	}
+	return {};
+}
+
+auto Message::takeEffectAnimation()
+-> std::unique_ptr<Ui::ReactionFlyAnimation> {
+	return _bottomInfo.takeEffectAnimation();
 }
 
 QSize Message::performCountOptimalSize() {
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index 62ab6c02bc82c..77c7c5fad15f0 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -158,6 +158,10 @@ class Message final : public Element {
 		Data::ReactionId,
 		std::unique_ptr<Ui::ReactionFlyAnimation>> override;
 
+	void animateEffect(Ui::ReactionFlyAnimationArgs &&args) override;
+	auto takeEffectAnimation()
+	-> std::unique_ptr<Ui::ReactionFlyAnimation> override;
+
 	QRect innerGeometry() const override;
 	[[nodiscard]] BottomRippleMask bottomRippleMask(int buttonHeight) const;
 
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
index 328a8749a1386..3a79d50b79d04 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
@@ -182,7 +182,7 @@ InlineList::Button InlineList::prepareButtonWithId(const ReactionId &id) {
 			customId,
 			_customEmojiRepaint);
 	} else {
-		_owner->preloadImageFor(id);
+		_owner->preloadReactionImageFor(id);
 	}
 	return result;
 }
@@ -439,9 +439,7 @@ void InlineList::paint(
 			}
 		}
 		if (!button.custom && button.image.isNull()) {
-			button.image = _owner->resolveImageFor(
-				button.id,
-				::Data::Reactions::ImageSize::InlineList);
+			button.image = _owner->resolveReactionImageFor(button.id);
 		}
 
 		const auto textFg = !inbubble
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 91ba60a37c7da..302c5b593d2e4 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -904,6 +904,8 @@ reactionMainAppearShift: 20px;
 reactionCollapseFadeThreshold: 40px;
 reactionFlyUp: 50px;
 
+effectInfoImage: 12px;
+
 searchInChatMultiSelectItem: MultiSelectItem(defaultMultiSelectItem) {
 	maxWidth: 200px;
 }

From a19e71324bdac60b0c74a08486887ca9721cea17 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 7 May 2024 14:58:03 +0400
Subject: [PATCH 170/400] Implement basic effect animation.

---
 .../data/data_message_reactions.cpp           |  13 ++
 .../SourceFiles/data/data_message_reactions.h |   1 +
 Telegram/SourceFiles/data/data_types.h        |   2 +
 .../admin_log/history_admin_log_inner.cpp     |   5 +
 .../admin_log/history_admin_log_inner.h       |   3 +
 .../history/history_inner_widget.cpp          |  23 +++-
 .../history/history_inner_widget.h            |   3 +
 Telegram/SourceFiles/history/history_item.cpp |  18 +++
 Telegram/SourceFiles/history/history_item.h   |   2 +
 .../SourceFiles/history/history_widget.cpp    |   7 +-
 .../history/view/history_view_bottom_info.cpp |  22 +--
 .../history/view/history_view_bottom_info.h   |   6 +-
 .../history/view/history_view_element.cpp     |   5 +
 .../history/view/history_view_element.h       |   6 +
 .../view/history_view_emoji_interactions.cpp  | 126 +++++++++++++++++-
 .../view/history_view_emoji_interactions.h    |  24 ++++
 .../history/view/history_view_list_widget.cpp |   6 +
 .../history/view/history_view_list_widget.h   |   3 +
 .../history/view/history_view_message.cpp     |   2 +-
 19 files changed, 258 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index 539c55306a90e..8682ba6553125 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -19,6 +19,7 @@ For license and copyright information please follow this link:
 #include "data/data_changes.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
+#include "data/data_file_origin.h"
 #include "data/data_peer_values.h"
 #include "data/data_saved_sublist.h"
 #include "data/stickers/data_custom_emoji.h"
@@ -594,6 +595,9 @@ void Reactions::preloadImageFor(const ReactionId &id) {
 		} else {
 			generateImage(set, i->title);
 		}
+		if (set.effect) {
+			preloadEffect(*i);
+		}
 	} else if (set.effect && !_waitingForEffects) {
 		_waitingForEffects = true;
 		refreshEffects();
@@ -603,6 +607,15 @@ void Reactions::preloadImageFor(const ReactionId &id) {
 	}
 }
 
+void Reactions::preloadEffect(const Reaction &effect) {
+	if (effect.aroundAnimation) {
+		effect.aroundAnimation->createMediaView()->checkStickerLarge();
+	} else {
+		const auto premium = effect.selectAnimation;
+		premium->loadVideoThumbnail(premium->stickerSetOrigin());
+	}
+}
+
 void Reactions::preloadAnimationsFor(const ReactionId &id) {
 	const auto custom = id.custom();
 	const auto document = custom ? _owner->document(custom).get() : nullptr;
diff --git a/Telegram/SourceFiles/data/data_message_reactions.h b/Telegram/SourceFiles/data/data_message_reactions.h
index 755b1c4d27a6e..a1254a6d7bd8b 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.h
+++ b/Telegram/SourceFiles/data/data_message_reactions.h
@@ -212,6 +212,7 @@ class Reactions final : private CustomEmojiManager::Listener {
 	[[nodiscard]] std::optional<Reaction> parse(
 		const MTPAvailableEffect &entry);
 
+	void preloadEffect(const Reaction &effect);
 	void preloadImageFor(const ReactionId &id);
 	[[nodiscard]] QImage resolveImageFor(const ReactionId &id);
 	void loadImage(
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index acc5c89157d64..4d0e5b3d74863 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -321,6 +321,8 @@ enum class MessageFlag : uint64 {
 	ReactionsAreTags      = (1ULL << 43),
 
 	ShortcutMessage       = (1ULL << 44),
+
+	EffectWatchedLocal    = (1ULL << 45),
 };
 inline constexpr bool is_flag_type(MessageFlag) { return true; }
 using MessageFlags = base::flags<MessageFlag>;
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 b7bb4b9e059e8..61cf9a8897b0b 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -674,6 +674,11 @@ void InnerWidget::elementStartPremium(
 void InnerWidget::elementCancelPremium(not_null<const Element*> view) {
 }
 
+void InnerWidget::elementStartEffect(
+	not_null<const Element*> view,
+	Element *replacing) {
+}
+
 QString InnerWidget::elementAuthorRank(not_null<const Element*> view) {
 	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 f47afddfa7e0e..bbe3c03813e93 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
@@ -136,6 +136,9 @@ class InnerWidget final
 		HistoryView::Element *replacing) override;
 	void elementCancelPremium(
 		not_null<const HistoryView::Element*> view) override;
+	void elementStartEffect(
+		not_null<const HistoryView::Element*> view,
+		HistoryView::Element *replacing) override;
 	QString elementAuthorRank(
 		not_null<const HistoryView::Element*> view) override;
 
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 9809f9c89e1df..aed2480cc05b2 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -304,12 +304,18 @@ class HistoryMainElementDelegate final
 			_widget->elementStartPremium(view, replacing);
 		}
 	}
-
 	void elementCancelPremium(not_null<const Element*> view) override {
 		if (_widget) {
 			_widget->elementCancelPremium(view);
 		}
 	}
+	void elementStartEffect(
+			not_null<const Element*> view,
+			Element *replacing) override {
+		if (_widget) {
+			_widget->elementStartEffect(view, replacing);
+		}
+	}
 
 	QString elementAuthorRank(not_null<const Element*> view) override {
 		return {};
@@ -950,6 +956,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 	_translateTracker->startBunch();
 	auto readTill = (HistoryItem*)nullptr;
 	auto readContents = base::flat_set<not_null<HistoryItem*>>();
+	auto startEffects = base::flat_set<not_null<const Element*>>();
 	const auto markingAsViewed = _widget->markingContentsRead();
 	const auto guard = gsl::finally([&] {
 		if (_pinnedItem) {
@@ -958,6 +965,11 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 		_translateTracker->finishBunch();
 		if (readTill && _widget->markingMessagesRead()) {
 			session().data().histories().readInboxTill(readTill);
+			if (!startEffects.empty()) {
+				for (const auto &view : startEffects) {
+					_emojiInteractions->playEffectOnRead(view);
+				}
+			}
 		}
 		if (markingAsViewed && !readContents.empty()) {
 			session().api().markContentsRead(readContents);
@@ -991,6 +1003,9 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 				session().sponsoredMessages().view(item->fullId());
 			} else if (isUnread) {
 				readTill = item;
+				if (item->hasUnwatchedEffect()) {
+					startEffects.emplace(view);
+				}
 			}
 			if (markingAsViewed && item->hasViews()) {
 				session().api().views().scheduleIncrement(item);
@@ -3568,6 +3583,12 @@ void HistoryInner::elementCancelPremium(not_null<const Element*> view) {
 	_emojiInteractions->cancelPremiumEffect(view);
 }
 
+void HistoryInner::elementStartEffect(
+		not_null<const Element*> view,
+		Element *replacing) {
+	_emojiInteractions->playEffect(view);
+}
+
 auto HistoryInner::getSelectionState() const
 -> HistoryView::TopBarWidget::SelectedState {
 	auto result = HistoryView::TopBarWidget::SelectedState {};
diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h
index 11eb81a5a81bf..2ab1207a1624a 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.h
+++ b/Telegram/SourceFiles/history/history_inner_widget.h
@@ -170,6 +170,9 @@ class HistoryInner
 		not_null<const Element*> view,
 		Element *replacing);
 	void elementCancelPremium(not_null<const Element*> view);
+	void elementStartEffect(
+		not_null<const Element*> view,
+		Element *replacing);
 
 	void updateBotInfo(bool recount = true);
 
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index b65173f0010c4..7e929a816cff4 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -687,6 +687,9 @@ HistoryItem::HistoryItem(
 	if (isHistoryEntry() && IsClientMsgId(id)) {
 		_history->registerClientSideMessage(this);
 	}
+	if (_effectId) {
+		_history->owner().reactions().preloadEffectImageFor(_effectId);
+	}
 }
 
 HistoryItem::HistoryItem(
@@ -1283,6 +1286,21 @@ bool HistoryItem::hasUnreadReaction() const {
 	return (_flags & MessageFlag::HasUnreadReaction);
 }
 
+bool HistoryItem::hasUnwatchedEffect() const {
+	return !out()
+		&& effectId()
+		&& !(_flags & MessageFlag::EffectWatchedLocal)
+		&& unread(history());
+}
+
+bool HistoryItem::markEffectWatched() {
+	if (!hasUnwatchedEffect()) {
+		return false;
+	}
+	_flags |= MessageFlag::EffectWatchedLocal;
+	return true;
+}
+
 bool HistoryItem::mentionsMe() const {
 	if (Has<HistoryServicePinned>()
 		&& !Core::App().settings().notifyAboutPinned()) {
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index de437cfe43bd6..1a276a447035a 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -241,6 +241,8 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] bool mentionsMe() const;
 	[[nodiscard]] bool isUnreadMention() const;
 	[[nodiscard]] bool hasUnreadReaction() const;
+	[[nodiscard]] bool hasUnwatchedEffect() const;
+	bool markEffectWatched();
 	[[nodiscard]] bool isUnreadMedia() const;
 	[[nodiscard]] bool isIncomingUnreadMedia() const;
 	[[nodiscard]] bool hasUnreadMediaFlag() const;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index ce14ce6205c13..0f919d652c4cd 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1389,7 +1389,10 @@ int HistoryWidget::itemTopForHighlight(
 	const auto itemTop = _list->itemTop(view);
 	Assert(itemTop >= 0);
 
-	const auto reactionCenter = view->data()->hasUnreadReaction()
+	const auto item = view->data();
+	const auto unwatchedEffect = item->hasUnwatchedEffect();
+	const auto showReactions = item->hasUnreadReaction() || unwatchedEffect;
+	const auto reactionCenter = showReactions
 		? view->reactionButtonParameters({}, {}).center.y()
 		: -1;
 
@@ -2376,8 +2379,6 @@ void HistoryWidget::showHistory(
 			}
 		}
 
-		session().data().reactions().refreshEffects();
-
 		_scroll->hide();
 		_list = _scroll->setOwnedWidget(
 			object_ptr<HistoryInner>(this, _scroll, controller(), _history));
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index db8f49a2702c8..c7461f3fc9f8a 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -19,6 +19,7 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/view/history_view_message.h"
 #include "history/view/history_view_cursor_state.h"
+#include "chat_helpers/emoji_interactions.h"
 #include "core/click_handler_types.h"
 #include "main/main_session.h"
 #include "lottie/lottie_icon.h"
@@ -104,10 +105,11 @@ bool BottomInfo::isWide() const {
 }
 
 TextState BottomInfo::textState(
-		not_null<const HistoryItem*> item,
+		not_null<const Message*> view,
 		QPoint position) const {
+	const auto item = view->data();
 	auto result = TextState(item);
-	if (const auto link = replayEffectLink(item, position)) {
+	if (const auto link = replayEffectLink(view, position)) {
 		result.link = link;
 		return result;
 	}
@@ -158,7 +160,7 @@ TextState BottomInfo::textState(
 }
 
 ClickHandlerPtr BottomInfo::replayEffectLink(
-		not_null<const HistoryItem*> item,
+		not_null<const Message*> view,
 		QPoint position) const {
 	if (!_effect) {
 		return nullptr;
@@ -189,7 +191,7 @@ ClickHandlerPtr BottomInfo::replayEffectLink(
 			st::msgDateFont->height);
 		if (image.contains(position)) {
 			if (!_replayLink) {
-				_replayLink = replayEffectLink(item);
+				_replayLink = replayEffectLink(view);
 			}
 			return _replayLink;
 		}
@@ -200,15 +202,17 @@ ClickHandlerPtr BottomInfo::replayEffectLink(
 }
 
 ClickHandlerPtr BottomInfo::replayEffectLink(
-		not_null<const HistoryItem*> item) const {
+		not_null<const Message*> view) const {
+	const auto item = view->data();
 	const auto itemId = item->fullId();
 	const auto sessionId = item->history()->session().uniqueId();
-	return std::make_shared<LambdaClickHandler>([=](
-		ClickContext context) {
+	const auto weak = base::make_weak(view);
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
 		if (const auto controller = my.sessionWindow.get()) {
-			controller->showToast("playing nice effect..");
-			AssertIsDebug();
+			if (const auto strong = weak.get()) {
+				strong->delegate()->elementStartEffect(strong, nullptr);
+			}
 		}
 	});
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.h b/Telegram/SourceFiles/history/view/history_view_bottom_info.h
index b4cc26f51167c..c585281be082d 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.h
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.h
@@ -62,7 +62,7 @@ class BottomInfo final : public Object {
 	[[nodiscard]] int firstLineWidth() const;
 	[[nodiscard]] bool isWide() const;
 	[[nodiscard]] TextState textState(
-		not_null<const HistoryItem*> item,
+		not_null<const Message*> view,
 		QPoint position) const;
 	[[nodiscard]] bool isSignedAuthorElided() const;
 
@@ -106,10 +106,10 @@ class BottomInfo final : public Object {
 
 	[[nodiscard]] Effect prepareEffectWithId(EffectId id);
 	[[nodiscard]] ClickHandlerPtr replayEffectLink(
-		not_null<const HistoryItem*> item,
+		not_null<const Message*> view,
 		QPoint position) const;
 	[[nodiscard]] ClickHandlerPtr replayEffectLink(
-		not_null<const HistoryItem*> item) const;
+		not_null<const Message*> view) const;
 
 	const not_null<::Data::Reactions*> _reactionsOwner;
 	Data _data;
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 79fc506c14b65..ef5b0c830cbde 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -192,6 +192,11 @@ void DefaultElementDelegate::elementCancelPremium(
 	not_null<const Element*> view) {
 }
 
+void DefaultElementDelegate::elementStartEffect(
+	not_null<const Element*> view,
+	Element *replacing) {
+}
+
 QString DefaultElementDelegate::elementAuthorRank(
 	not_null<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 4316806ce28b9..324640b6d6688 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -113,6 +113,9 @@ class ElementDelegate {
 		not_null<const Element*> view,
 		Element *replacing) = 0;
 	virtual void elementCancelPremium(not_null<const Element*> view) = 0;
+	virtual void elementStartEffect(
+		not_null<const Element*> view,
+		Element *replacing) = 0;
 	virtual QString elementAuthorRank(not_null<const Element*> view) = 0;
 
 	virtual ~ElementDelegate() {
@@ -163,6 +166,9 @@ class DefaultElementDelegate : public ElementDelegate {
 		not_null<const Element*> view,
 		Element *replacing) override;
 	void elementCancelPremium(not_null<const Element*> view) override;
+	void elementStartEffect(
+		not_null<const Element*> view,
+		Element *replacing) override;
 	QString elementAuthorRank(not_null<const Element*> view) override;
 
 };
diff --git a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
index 91e18f9d82c68..c9b299a726a93 100644
--- a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_element.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/history.h"
+#include "history/history_item.h"
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "chat_helpers/emoji_interactions.h"
 #include "chat_helpers/stickers_lottie.h"
@@ -17,6 +18,7 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
+#include "data/data_message_reactions.h"
 #include "lottie/lottie_common.h"
 #include "lottie/lottie_single_player.h"
 #include "base/random.h"
@@ -45,8 +47,8 @@ constexpr auto kDropDelayedAfterDelay = crl::time(2000);
 EmojiInteractions::EmojiInteractions(
 	not_null<Main::Session*> session,
 	Fn<int(not_null<const Element*>)> itemTop)
-	: _session(session)
-	, _itemTop(std::move(itemTop)) {
+: _session(session)
+, _itemTop(std::move(itemTop)) {
 	_session->data().viewRemoved(
 	) | rpl::filter([=] {
 		return !_plays.empty() || !_delayed.empty();
@@ -56,6 +58,11 @@ EmojiInteractions::EmojiInteractions(
 			ranges::remove(_delayed, view, &Delayed::view),
 			end(_delayed));
 	}, _lifetime);
+
+	_session->data().reactions().effectsUpdates(
+	) | rpl::start_with_next([=] {
+		checkPendingEffects();
+	}, _lifetime);
 }
 
 EmojiInteractions::~EmojiInteractions() = default;
@@ -143,6 +150,121 @@ void EmojiInteractions::play(
 		false);
 }
 
+void EmojiInteractions::playEffectOnRead(not_null<const Element*> view) {
+	if (view->data()->markEffectWatched()) {
+		playEffect(view);
+	}
+}
+
+void EmojiInteractions::playEffect(not_null<const Element*> view) {
+	if (const auto resolved = resolveEffect(view)) {
+		playEffect(view, resolved);
+	} else if (view->data()->effectId()) {
+		if (resolved.document && !_downloadLifetime) {
+			_downloadLifetime = _session->downloaderTaskFinished(
+			) | rpl::start_with_next([=] {
+				checkPendingEffects();
+			});
+		}
+		addPendingEffect(view);
+	}
+}
+
+EmojiInteractions::ResolvedEffect EmojiInteractions::resolveEffect(
+		not_null<const Element*> view) {
+	const auto item = view->data();
+	const auto effectId = item->effectId();
+	if (!effectId) {
+		return {};
+	}
+	using Type = Data::Reactions::Type;
+	const auto &effects = _session->data().reactions().list(Type::Effects);
+	const auto i = ranges::find(
+		effects,
+		Data::ReactionId{ effectId },
+		&Data::Reaction::id);
+	if (i == end(effects)) {
+		return {};
+	}
+	auto document = (DocumentData*)nullptr;
+	auto content = QByteArray();
+	auto filepath = QString();
+	if ((document = i->aroundAnimation)) {
+		content = document->createMediaView()->bytes();
+		filepath = document->filepath();
+	} else {
+		document = i->selectAnimation;
+		content = document->createMediaView()->videoThumbnailContent();
+	}
+	return {
+		.emoticon = i->title,
+		.document = document,
+		.content = content,
+		.filepath = filepath,
+	};
+}
+
+void EmojiInteractions::playEffect(
+		not_null<const Element*> view,
+		const ResolvedEffect &resolved) {
+	play(
+		resolved.emoticon,
+		view,
+		resolved.document,
+		resolved.content,
+		resolved.filepath,
+		false,
+		false);
+}
+
+void EmojiInteractions::addPendingEffect(not_null<const Element*> view) {
+	auto found = false;
+	const auto predicate = [&](base::weak_ptr<const Element> weak) {
+		const auto strong = weak.get();
+		if (strong == view) {
+			found = true;
+		}
+		return !strong;
+	};
+	_pendingEffects.erase(
+		ranges::remove_if(_pendingEffects, predicate),
+		end(_pendingEffects));
+	if (!found) {
+		_pendingEffects.push_back(view);
+	}
+}
+
+void EmojiInteractions::checkPendingEffects() {
+	auto waitingDownload = false;
+	const auto predicate = [&](base::weak_ptr<const Element> weak) {
+		const auto strong = weak.get();
+		if (!strong) {
+			return true;
+		}
+		const auto resolved = resolveEffect(strong);
+		if (resolved) {
+			playEffect(strong, resolved);
+			return true;
+		} else if (!strong->data()->effectId()) {
+			return true;
+		} else if (resolved.document) {
+			waitingDownload = true;
+		}
+		return false;
+	};
+	_pendingEffects.erase(
+		ranges::remove_if(_pendingEffects, predicate),
+		end(_pendingEffects));
+	if (!waitingDownload) {
+		_downloadLifetime.destroy();
+	} else if (!_downloadLifetime) {
+		_downloadLifetime = _session->downloaderTaskFinished(
+		) | rpl::start_with_next([=] {
+			checkPendingEffects();
+		});
+	}
+}
+
 void EmojiInteractions::play(
 		QString emoticon,
 		not_null<const Element*> view,
diff --git a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h
index 4d38f38ebfb27..b7af259975d88 100644
--- a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h
+++ b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h
@@ -43,6 +43,9 @@ class EmojiInteractions final {
 	void cancelPremiumEffect(not_null<const Element*> view);
 	void visibleAreaUpdated(int visibleTop, int visibleBottom);
 
+	void playEffectOnRead(not_null<const Element*> view);
+	void playEffect(not_null<const Element*> view);
+
 	void paint(QPainter &p);
 	[[nodiscard]] rpl::producer<QRect> updateRequests() const;
 	[[nodiscard]] rpl::producer<QString> playStarted() const;
@@ -68,6 +71,16 @@ class EmojiInteractions final {
 		crl::time shouldHaveStartedAt = 0;
 		bool incoming = false;
 	};
+	struct ResolvedEffect {
+		QString emoticon;
+		DocumentData *document = nullptr;
+		QByteArray content;
+		QString filepath;
+
+		explicit operator bool() const {
+			return document && (!content.isEmpty() || !filepath.isEmpty());
+		}
+	};
 
 	[[nodiscard]] QRect computeRect(const Play &play) const;
 
@@ -85,6 +98,14 @@ class EmojiInteractions final {
 		bool incoming,
 		bool premium);
 	void checkDelayed();
+	void addPendingEffect(not_null<const Element*> view);
+
+	[[nodiscard]] ResolvedEffect resolveEffect(
+		not_null<const Element*> view);
+	void playEffect(
+		not_null<const Element*> view,
+		const ResolvedEffect &resolved);
+	void checkPendingEffects();
 
 	const not_null<Main::Session*> _session;
 	const Fn<int(not_null<const Element*>)> _itemTop;
@@ -97,6 +118,9 @@ class EmojiInteractions final {
 	rpl::event_stream<QRect> _updateRequests;
 	rpl::event_stream<QString> _playStarted;
 
+	std::vector<base::weak_ptr<const Element>> _pendingEffects;
+	rpl::lifetime _downloadLifetime;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index a320a67f78b43..59fb595343fc9 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1857,6 +1857,12 @@ void ListWidget::elementCancelPremium(not_null<const Element*> view) {
 	_emojiInteractions->cancelPremiumEffect(view);
 }
 
+void ListWidget::elementStartEffect(
+		not_null<const Element*> view,
+		Element *replacing) {
+	_emojiInteractions->playEffect(view);
+}
+
 QString ListWidget::elementAuthorRank(not_null<const Element*> view) {
 	return _delegate->listElementAuthorRank(view);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index e5304bb446d9b..b85bb7bed6b54 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -419,6 +419,9 @@ class ListWidget final
 		not_null<const Element*> view,
 		Element *replacing) override;
 	void elementCancelPremium(not_null<const Element*> view) override;
+	void elementStartEffect(
+		not_null<const Element*> view,
+		Element *replacing) override;
 	QString elementAuthorRank(not_null<const Element*> view) override;
 
 	void setEmptyInfoWidget(base::unique_qptr<Ui::RpWidget> &&w);
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index ea17702ee4499..32cf1f5ade39a 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -3038,7 +3038,7 @@ TextState Message::bottomInfoTextState(
 	const auto infoLeft = infoRight - size.width();
 	const auto infoTop = infoBottom - size.height();
 	return _bottomInfo.textState(
-		data(),
+		this,
 		point - QPoint{ infoLeft, infoTop });
 }
 

From 92133e7f504f00eac200f4bc25eddb1503b9c627 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 7 May 2024 22:15:34 +0400
Subject: [PATCH 171/400] Show effect animation with correct geometry.

---
 .../SourceFiles/boxes/premium_preview_box.cpp |  2 +-
 .../chat_helpers/stickers_emoji_pack.cpp      | 17 ++--
 .../chat_helpers/stickers_emoji_pack.h        | 22 ++++-
 .../data/data_message_reactions.cpp           |  3 +
 .../history/view/history_view_bottom_info.cpp | 35 ++++----
 .../history/view/history_view_bottom_info.h   |  2 +
 .../history/view/history_view_element.cpp     |  4 +
 .../history/view/history_view_element.h       |  1 +
 .../view/history_view_emoji_interactions.cpp  | 55 +++++++++----
 .../view/history_view_emoji_interactions.h    |  8 +-
 .../history/view/history_view_message.cpp     | 82 +++++++++++++++++++
 .../history/view/history_view_message.h       |  1 +
 .../view/media/history_view_sticker.cpp       |  5 ++
 .../history/view/media/history_view_sticker.h |  1 +
 .../window/window_media_preview.cpp           |  2 +-
 15 files changed, 197 insertions(+), 43 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index 30f3127451b55..76a2a18b76788 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -286,7 +286,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 			document,
 			media->videoThumbnailContent(),
 			QString(),
-			true);
+			Stickers::EffectType::PremiumSticker);
 
 		const auto update = [=] {
 			if (!state->readyInvoked
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
index f4cc13c4c13b1..af07736a48a44 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
@@ -269,10 +269,10 @@ std::unique_ptr<Lottie::SinglePlayer> EmojiPack::effectPlayer(
 		not_null<DocumentData*> document,
 		QByteArray data,
 		QString filepath,
-		bool premium) {
+		EffectType type) {
 	// Shortened copy from stickers_lottie module.
 	const auto baseKey = document->bigFileBaseCacheKey();
-	const auto tag = uint8(0);
+	const auto tag = uint8(type);
 	const auto keyShift = ((tag << 4) & 0xF0)
 		| (uint8(ChatHelpers::StickerLottieSize::EmojiInteraction) & 0x0F);
 	const auto key = Storage::Cache::Key{
@@ -292,19 +292,24 @@ std::unique_ptr<Lottie::SinglePlayer> EmojiPack::effectPlayer(
 				std::move(data));
 		});
 	};
-	const auto size = premium
+	const auto size = (type == EffectType::PremiumSticker)
 		? HistoryView::Sticker::PremiumEffectSize(document)
-		: HistoryView::Sticker::EmojiEffectSize();
+		: (type == EffectType::EmojiInteraction)
+		? HistoryView::Sticker::EmojiEffectSize()
+		: HistoryView::Sticker::MessageEffectSize();
 	const auto request = Lottie::FrameRequest{
 		size * style::DevicePixelRatio(),
 	};
-	auto &weakProvider = _sharedProviders[document];
+	auto &weakProvider = _sharedProviders[{ document, type }];
 	auto shared = [&] {
 		if (const auto result = weakProvider.lock()) {
 			return result;
 		}
+		const auto count = (type == EffectType::PremiumSticker)
+			? kPremiumCachesCount
+			: kEmojiCachesCount;
 		const auto result = Lottie::SinglePlayer::SharedProvider(
-			premium ? kPremiumCachesCount : kEmojiCachesCount,
+			count,
 			get,
 			put,
 			Lottie::ReadContent(data, filepath),
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.h b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.h
index 0226b04ef6246..133880e1a5de3 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.h
@@ -50,6 +50,12 @@ struct LargeEmojiImage {
 	[[nodiscard]] static QSize Size();
 };
 
+enum class EffectType : uint8 {
+	EmojiInteraction,
+	PremiumSticker,
+	MessageEffect,
+};
+
 class EmojiPack final {
 public:
 	using ViewElement = HistoryView::Element;
@@ -95,11 +101,23 @@ class EmojiPack final {
 		not_null<DocumentData*> document,
 		QByteArray data,
 		QString filepath,
-		bool premium);
+		EffectType type);
 
 private:
 	class ImageLoader;
 
+	struct ProviderKey {
+		not_null<DocumentData*> document;
+		Stickers::EffectType type = {};
+
+		friend inline auto operator<=>(
+			const ProviderKey &,
+			const ProviderKey &) = default;
+		friend inline bool operator==(
+			const ProviderKey &,
+			const ProviderKey &) = default;
+	};
+
 	void refresh();
 	void refreshDelayed();
 	void refreshAnimations();
@@ -135,7 +153,7 @@ class EmojiPack final {
 	mtpRequestId _animationsRequestId = 0;
 
 	base::flat_map<
-		not_null<DocumentData*>,
+		ProviderKey,
 		std::weak_ptr<Lottie::FrameProvider>> _sharedProviders;
 
 	rpl::event_stream<> _refreshed;
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index 8682ba6553125..a04cbcbfb52da 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -737,6 +737,9 @@ void Reactions::resolveEffectImages() {
 			LOG(("API Error: Effect '%1' not found!"
 				).arg(ReactionIdToLog(id)));
 		}
+		if (i != end(_effects)) {
+			preloadEffect(*i);
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index c7461f3fc9f8a..8af94c73bcb84 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -173,20 +173,10 @@ ClickHandlerPtr BottomInfo::replayEffectLink(
 		left += width() - available;
 		top += st::msgDateFont->height;
 	}
-	auto x = left;
-	auto y = top;
-	auto widthLeft = available;
 	if (_effect) {
-		const auto add = st::reactionInfoBetween;
-		const auto width = st::reactionInfoSize;
-		if (x > left && widthLeft < width) {
-			x = left;
-			y += st::msgDateFont->height;
-			widthLeft = available;
-		}
 		const auto image = QRect(
-			x,
-			y,
+			left,
+			top,
 			st::reactionInfoSize,
 			st::msgDateFont->height);
 		if (image.contains(position)) {
@@ -195,8 +185,6 @@ ClickHandlerPtr BottomInfo::replayEffectLink(
 			}
 			return _replayLink;
 		}
-		x += width + add;
-		widthLeft -= width + add;
 	}
 	return nullptr;
 }
@@ -544,6 +532,25 @@ void BottomInfo::continueEffectAnimation(
 	}
 }
 
+QRect BottomInfo::effectIconGeometry() const {
+	if (!_effect) {
+		return {};
+	}
+	auto left = 0;
+	auto top = 0;
+	auto available = width();
+	if (height() != minHeight()) {
+		available = std::min(available, _effectMaxWidth);
+		left += width() - available;
+		top += st::msgDateFont->height;
+	}
+	return QRect(
+		left + (st::reactionInfoSize - st::effectInfoImage) / 2,
+		top + (st::msgDateFont->height - st::effectInfoImage) / 2,
+		st::effectInfoImage,
+		st::effectInfoImage);
+}
+
 BottomInfo::Data BottomInfoDataFromMessage(not_null<Message*> message) {
 	using Flag = BottomInfo::Data::Flag;
 	const auto item = message->data();
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.h b/Telegram/SourceFiles/history/view/history_view_bottom_info.h
index c585281be082d..594a488f1394a 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.h
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.h
@@ -82,6 +82,8 @@ class BottomInfo final : public Object {
 	void continueEffectAnimation(
 		std::unique_ptr<Ui::ReactionFlyAnimation> animation);
 
+	QRect effectIconGeometry() const;
+
 private:
 	struct Effect;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index ef5b0c830cbde..82688196a096d 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -1786,6 +1786,10 @@ auto Element::takeEffectAnimation()
 	return nullptr;
 }
 
+QRect Element::effectIconGeometry() const {
+	return QRect();
+}
+
 Element::~Element() {
 	// Delete media while owner still exists.
 	clearSpecialOnlyEmoji();
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 324640b6d6688..ab458b1a5ddd2 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -523,6 +523,7 @@ class Element
 	void previousInBlocksChanged();
 	void nextInBlocksRemoved();
 
+	[[nodiscard]] virtual QRect effectIconGeometry() const;
 	[[nodiscard]] virtual QRect innerGeometry() const = 0;
 
 	void customEmojiRepaint();
diff --git a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
index c9b299a726a93..efda8ead15331 100644
--- a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
@@ -119,7 +119,7 @@ bool EmojiInteractions::playPremiumEffect(
 					document->createMediaView()->videoThumbnailContent(),
 					QString(),
 					false,
-					true);
+					Stickers::EffectType::PremiumSticker);
 			}
 		}
 	}
@@ -147,7 +147,7 @@ void EmojiInteractions::play(
 		media->bytes(),
 		media->owner()->filepath(),
 		incoming,
-		false);
+		Stickers::EffectType::EmojiInteraction);
 }
 
 void EmojiInteractions::playEffectOnRead(not_null<const Element*> view) {
@@ -214,7 +214,7 @@ void EmojiInteractions::playEffect(
 		resolved.content,
 		resolved.filepath,
 		false,
-		false);
+		Stickers::EffectType::MessageEffect);
 }
 
 void EmojiInteractions::addPendingEffect(not_null<const Element*> view) {
@@ -272,7 +272,7 @@ void EmojiInteractions::play(
 		QByteArray data,
 		QString filepath,
 		bool incoming,
-		bool premium) {
+		Stickers::EffectType type) {
 	const auto top = _itemTop(view);
 	const auto bottom = top + view->height();
 	if (_visibleTop >= bottom
@@ -286,12 +286,14 @@ void EmojiInteractions::play(
 		document,
 		data,
 		filepath,
-		premium);
+		type);
 
-	const auto inner = premium
+	const auto inner = (type == Stickers::EffectType::PremiumSticker)
 		? HistoryView::Sticker::Size(document)
 		: HistoryView::Sticker::EmojiSize();
-	const auto shift = premium ? QPoint() : GenerateRandomShift(inner);
+	const auto shift = (type == Stickers::EffectType::EmojiInteraction)
+		? GenerateRandomShift(inner)
+		: QPoint();
 	const auto raw = lottie.get();
 	lottie->updates(
 	) | rpl::start_with_next([=](Lottie::Update update) {
@@ -312,16 +314,18 @@ void EmojiInteractions::play(
 		.lottie = std::move(lottie),
 		.shift = shift,
 		.inner = inner,
-		.outer = (premium
+		.outer = ((type == Stickers::EffectType::PremiumSticker)
 			? HistoryView::Sticker::PremiumEffectSize(document)
-			: HistoryView::Sticker::EmojiEffectSize()),
-		.premium = premium,
+			: (type == Stickers::EffectType::EmojiInteraction)
+			? HistoryView::Sticker::EmojiEffectSize()
+			: HistoryView::Sticker::MessageEffectSize()),
+		.type = type,
 	});
 	if (incoming) {
 		_playStarted.fire(std::move(emoticon));
 	}
 	if (const auto media = view->media()) {
-		if (!premium) {
+		if (type == Stickers::EffectType::EmojiInteraction) {
 			media->stickerClearLoopPlayed();
 		}
 	}
@@ -336,9 +340,28 @@ void EmojiInteractions::visibleAreaUpdated(
 
 QRect EmojiInteractions::computeRect(const Play &play) const {
 	const auto view = play.view;
+	const auto viewTop = _itemTop(view);
+	if (viewTop < 0) {
+		return QRect();
+	}
+	if (play.type == Stickers::EffectType::MessageEffect) {
+		const auto icon = view->effectIconGeometry();
+		if (icon.isEmpty()) {
+			return QRect();
+		}
+		const auto size = play.outer;
+		const auto shift = view->hasRightLayout()
+			? (-size.width() / 3)
+			: (size.width() / 3);
+		return QRect(
+			shift + icon.x() + (icon.width() - size.width()) / 2,
+			viewTop + icon.y() + (icon.height() - size.height()) / 2,
+			size.width(),
+			size.height());
+	}
 	const auto sticker = play.inner;
 	const auto size = play.outer;
-	const auto shift = play.premium
+	const auto shift = (play.type == Stickers::EffectType::PremiumSticker)
 		? int(sticker.width() * kPremiumShift)
 		: (size.width() / 40);
 	const auto inner = view->innerGeometry();
@@ -346,11 +369,9 @@ QRect EmojiInteractions::computeRect(const Play &play) const {
 	const auto left = rightAligned
 		? (inner.x() + inner.width() + shift - size.width())
 		: (inner.x() - shift);
-	const auto viewTop = _itemTop(view) + inner.y();
-	if (viewTop < 0) {
-		return QRect();
-	}
-	const auto top = viewTop + (sticker.height() - size.height()) / 2;
+	const auto top = viewTop
+		+ inner.y()
+		+ (sticker.height() - size.height()) / 2;
 	return QRect(QPoint(left, top), size).translated(play.shift);
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h
index b7af259975d88..679b102a58fa5 100644
--- a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h
+++ b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h
@@ -23,6 +23,10 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace Stickers {
+enum class EffectType : uint8;
+} // namespace Stickers
+
 namespace HistoryView {
 
 class Element;
@@ -60,7 +64,7 @@ class EmojiInteractions final {
 		int frame = 0;
 		int framesCount = 0;
 		int frameRate = 0;
-		bool premium = false;
+		Stickers::EffectType type = {};
 		bool started = false;
 		bool finished = false;
 	};
@@ -96,7 +100,7 @@ class EmojiInteractions final {
 		QByteArray data,
 		QString filepath,
 		bool incoming,
-		bool premium);
+		Stickers::EffectType type);
 	void checkDelayed();
 	void addPendingEffect(not_null<const Element*> view);
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 32cf1f5ade39a..cf19c8f9a3696 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -707,6 +707,88 @@ auto Message::takeEffectAnimation()
 	return _bottomInfo.takeEffectAnimation();
 }
 
+QRect Message::effectIconGeometry() const {
+	const auto item = data();
+	const auto media = this->media();
+
+	auto g = countGeometry();
+	if (g.width() < 1 || isHidden()) {
+		return {};
+	}
+	const auto bubble = drawBubble();
+	const auto reactionsInBubble = _reactions && embedReactionsInBubble();
+	const auto mediaDisplayed = media && media->isDisplayed();
+	const auto keyboard = item->inlineReplyKeyboard();
+	auto keyboardHeight = 0;
+	if (keyboard) {
+		keyboardHeight = keyboard->naturalHeight();
+		g.setHeight(g.height() - st::msgBotKbButton.margin - keyboardHeight);
+	}
+
+	const auto fromBottomInfo = [&](QPoint bottomRight) {
+		const auto size = _bottomInfo.currentSize();
+		return _bottomInfo.effectIconGeometry().translated(
+			bottomRight - QPoint(size.width(), size.height()));
+	};
+	if (bubble) {
+		auto entry = logEntryOriginal();
+
+		// Entry page is always a bubble bottom.
+		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
+
+		auto inner = g;
+		if (_comments) {
+			inner.setHeight(inner.height() - st::historyCommentsButtonHeight);
+		}
+		auto trect = inner.marginsRemoved(st::msgPadding);
+		const auto reactionsTop = (reactionsInBubble && !_viewButton)
+			? st::mediaInBubbleSkip
+			: 0;
+		const auto reactionsHeight = reactionsInBubble
+			? (reactionsTop + _reactions->height())
+			: 0;
+		if (_viewButton) {
+			const auto belowInfo = _viewButton->belowMessageInfo();
+			const auto infoHeight = reactionsInBubble
+				? (reactionsHeight + 2 * st::mediaInBubbleSkip)
+				: _bottomInfo.height();
+			const auto heightMargins = QMargins(0, 0, 0, infoHeight);
+			if (belowInfo) {
+				inner -= heightMargins;
+			}
+			trect.setHeight(trect.height() - _viewButton->height());
+			if (reactionsInBubble) {
+				trect.setHeight(trect.height() - st::mediaInBubbleSkip + st::msgPadding.bottom());
+			} else if (mediaDisplayed) {
+				trect.setHeight(trect.height() - st::mediaInBubbleSkip);
+			}
+		}
+		if (mediaOnBottom) {
+			trect.setHeight(trect.height()
+				+ st::msgPadding.bottom()
+				- viewButtonHeight());
+		}
+		if (mediaOnTop) {
+			trect.setY(trect.y() - st::msgPadding.top());
+		}
+		if (mediaDisplayed && mediaOnBottom && media->customInfoLayout()) {
+			auto mediaHeight = media->height();
+			auto mediaLeft = trect.x() - st::msgPadding.left();
+			auto mediaTop = (trect.y() + trect.height() - mediaHeight);
+			return fromBottomInfo(QPoint(mediaLeft, mediaTop) + media->resolveCustomInfoRightBottom());
+		} else {
+			return fromBottomInfo({
+				inner.left() + inner.width() - (st::msgPadding.right() - st::msgDateDelta.x()),
+				inner.top() + inner.height() - (st::msgPadding.bottom() - st::msgDateDelta.y()),
+			});
+		}
+	} else if (mediaDisplayed) {
+		return fromBottomInfo(g.topLeft() + media->resolveCustomInfoRightBottom());
+	}
+	return {};
+}
+
 QSize Message::performCountOptimalSize() {
 	const auto item = data();
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index 77c7c5fad15f0..a8c172c03df37 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -162,6 +162,7 @@ class Message final : public Element {
 	auto takeEffectAnimation()
 	-> std::unique_ptr<Ui::ReactionFlyAnimation> override;
 
+	QRect effectIconGeometry() const override;
 	QRect innerGeometry() const override;
 	[[nodiscard]] BottomRippleMask bottomRippleMask(int buttonHeight) const;
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index c8527d9993197..69e8bc0af80b1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -41,6 +41,7 @@ constexpr auto kMaxSizeFixed = 512;
 constexpr auto kMaxEmojiSizeFixed = 256;
 constexpr auto kPremiumMultiplier = (1 + 0.245 * 2);
 constexpr auto kEmojiMultiplier = 3;
+constexpr auto kMessageEffectMultiplier = 2;
 
 [[nodiscard]] QImage CacheDiceImage(
 		const QString &emoji,
@@ -208,6 +209,10 @@ QSize Sticker::EmojiEffectSize() {
 	return EmojiSize() * kEmojiMultiplier;
 }
 
+QSize Sticker::MessageEffectSize() {
+	return EmojiSize() * kMessageEffectMultiplier;
+}
+
 QSize Sticker::EmojiSize() {
 	const auto side = std::min(st::maxAnimatedEmojiSize, kMaxEmojiSizeFixed);
 	return { side, side };
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.h b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
index c6bbbd0daf223..91a69f7e2d1be 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
@@ -91,6 +91,7 @@ class Sticker final
 		not_null<DocumentData*> document);
 	[[nodiscard]] static QSize UsualPremiumEffectSize();
 	[[nodiscard]] static QSize EmojiEffectSize();
+	[[nodiscard]] static QSize MessageEffectSize();
 	[[nodiscard]] static QSize EmojiSize();
 	[[nodiscard]] static ClickHandlerPtr ShowSetHandler(
 		not_null<DocumentData*> document);
diff --git a/Telegram/SourceFiles/window/window_media_preview.cpp b/Telegram/SourceFiles/window/window_media_preview.cpp
index 3aa79501de0c4..87595711c95a1 100644
--- a/Telegram/SourceFiles/window/window_media_preview.cpp
+++ b/Telegram/SourceFiles/window/window_media_preview.cpp
@@ -339,7 +339,7 @@ void MediaPreviewWidget::setupLottie() {
 			_document,
 			_documentMedia->videoThumbnailContent(),
 			QString(),
-			true);
+			Stickers::EffectType::PremiumSticker);
 	} else {
 		const auto size = currentDimensions();
 		_lottie = std::make_unique<Lottie::SinglePlayer>(

From 396ba9a984d6aeb5a67d5b88741a3fd0abb15c2b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 9 May 2024 21:01:01 +0400
Subject: [PATCH 172/400] Initial code of attaching effect selector.

---
 Telegram/Resources/langs/lang.strings         |  3 +
 .../SourceFiles/boxes/create_poll_box.cpp     |  2 +
 Telegram/SourceFiles/boxes/send_files_box.cpp |  3 +-
 Telegram/SourceFiles/boxes/share_box.cpp      |  1 +
 .../history/history_inner_widget.cpp          |  6 +-
 .../SourceFiles/history/history_widget.cpp    |  7 +-
 .../history_view_compose_controls.cpp         |  1 +
 .../view/history_view_context_menu.cpp        |  1 +
 .../history/view/history_view_list_widget.cpp |  6 +-
 .../view/history_view_schedule_box.cpp        |  2 +
 .../history/view/history_view_schedule_box.h  |  7 ++
 .../view/history_view_scheduled_section.cpp   | 22 ++++--
 .../view/history_view_scheduled_section.h     |  5 ++
 .../reactions/history_view_reactions_button.h |  2 +-
 .../history_view_reactions_selector.cpp       | 18 +++--
 .../history_view_reactions_selector.h         |  6 +-
 .../history_view_reactions_strip.cpp          | 11 ++-
 .../reactions/history_view_reactions_strip.h  |  6 +-
 Telegram/SourceFiles/main/main_session.cpp    |  2 +
 Telegram/SourceFiles/main/main_session.h      | 13 +++-
 .../stories/media_stories_controller.cpp      |  5 --
 .../media/stories/media_stories_controller.h  |  3 -
 .../media/stories/media_stories_delegate.h    |  6 --
 .../media/stories/media_stories_reactions.cpp |  4 +-
 .../media/view/media_view_overlay_widget.cpp  |  6 --
 .../media/view/media_view_overlay_widget.h    |  8 ---
 Telegram/SourceFiles/menu/menu_send.cpp       | 71 +++++++++++++++++--
 Telegram/SourceFiles/menu/menu_send.h         |  7 +-
 .../window/window_session_controller.cpp      |  4 +-
 .../window/window_session_controller.h        |  8 ---
 30 files changed, 163 insertions(+), 83 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 87df781f8a8ae..3029db104a187 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -561,6 +561,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_reaction_invoice" = "{reaction} to your invoice";
 "lng_reaction_gif" = "{reaction} to your GIF";
 
+"lng_effect_add_title" = "Add an animated effect";
+"lng_effect_stickers_title" = "Message Effects";
+
 "lng_languages" = "Languages";
 "lng_languages_none" = "No languages found.";
 "lng_languages_count#one" = "{count} language";
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 1d02b5e52c216..c7de2a065ebda 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -1295,6 +1295,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		_controller->show(
 			HistoryView::PrepareScheduleBox(
 				this,
+				_controller->uiShow(),
 				SendMenu::Type::Scheduled,
 				send));
 	};
@@ -1327,6 +1328,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 	};
 	SendMenu::SetupMenuAndShortcuts(
 		submit.data(),
+		_controller->uiShow(),
 		sendMenuType,
 		sendSilent,
 		sendScheduled,
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index ea208d42fb0c4..8e1280f89c569 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -529,6 +529,7 @@ void SendFilesBox::refreshButtons() {
 	if (_sendType == Api::SendType::Normal) {
 		SendMenu::SetupMenuAndShortcuts(
 			_send,
+			_show,
 			[=] { return _sendMenuType; },
 			[=] { sendSilent(); },
 			[=] { sendScheduled(); },
@@ -1472,7 +1473,7 @@ void SendFilesBox::sendScheduled() {
 		? SendMenu::Type::ScheduledToUser
 		: _sendMenuType;
 	const auto callback = [=](Api::SendOptions options) { send(options); };
-	auto box = HistoryView::PrepareScheduleBox(this, type, callback);
+	auto box = HistoryView::PrepareScheduleBox(this, _show, type, callback);
 	const auto weak = Ui::MakeWeak(box.data());
 	_show->showBox(std::move(box));
 	if (const auto strong = weak.data()) {
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 32ec893d6a7b0..2d9ba4d3a383f 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -616,6 +616,7 @@ void ShareBox::submitScheduled() {
 	uiShow()->showBox(
 		HistoryView::PrepareScheduleBox(
 			this,
+			nullptr, // ChatHelpers::Show for effect attachment.
 			sendMenuType(),
 			callback,
 			HistoryView::DefaultScheduleTime(),
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index aed2480cc05b2..3b51df0d716f0 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -351,8 +351,7 @@ HistoryInner::HistoryInner(
 , _reactionsManager(
 	std::make_unique<HistoryView::Reactions::Manager>(
 		this,
-		[=](QRect updated) { update(updated); },
-		controller->cachedReactionIconFactory().createMethod()))
+		[=](QRect updated) { update(updated); }))
 , _touchSelectTimer([=] { onTouchSelect(); })
 , _touchScrollTimer([=] { onTouchScrollTimer(); })
 , _scrollDateCheck([this] { scrollDateCheck(); })
@@ -2778,8 +2777,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			desiredPosition,
 			reactItem,
 			[=](ChosenReaction reaction) { reactionChosen(reaction); },
-			ItemReactionsAbout(reactItem),
-			_controller->cachedReactionIconFactory().createMethod())
+			ItemReactionsAbout(reactItem))
 		: AttachSelectorResult::Skipped;
 	if (attached == AttachSelectorResult::Failed) {
 		_menu = nullptr;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 0f919d652c4cd..c89d3b0c78ebb 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -323,6 +323,7 @@ HistoryWidget::HistoryWidget(
 
 	SendMenu::SetupMenuAndShortcuts(
 		_send.get(),
+		controller->uiShow(),
 		[=] { return sendButtonMenuType(); },
 		[=] { sendSilent(); },
 		[=] { sendScheduled(); },
@@ -4192,7 +4193,11 @@ void HistoryWidget::sendScheduled() {
 	}
 	const auto callback = [=](Api::SendOptions options) { send(options); };
 	controller()->show(
-		HistoryView::PrepareScheduleBox(_list, sendMenuType(), callback));
+		HistoryView::PrepareScheduleBox(
+			_list,
+			controller()->uiShow(),
+			sendMenuType(),
+			callback));
 }
 
 void HistoryWidget::sendWhenOnline() {
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 9154d846ea389..7dcf2373bf95f 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2197,6 +2197,7 @@ void ComposeControls::initSendButton() {
 
 	SendMenu::SetupMenuAndShortcuts(
 		_send.get(),
+		_show,
 		[=] { return sendButtonMenuType(); },
 		SendMenu::DefaultSilentCallback(send),
 		SendMenu::DefaultScheduleCallback(_show, sendMenuType(), send),
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 88d9ad1835bd9..12e0b06c66566 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -589,6 +589,7 @@ bool AddRescheduleAction(
 		const auto box = request.navigation->parentController()->show(
 			HistoryView::PrepareScheduleBox(
 				&request.navigation->session(),
+				request.navigation->uiShow(),
 				sendMenuType,
 				callback,
 				date));
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 59fb595343fc9..c8eacd8e35fe9 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -115,8 +115,7 @@ auto WindowListDelegate::listMakeReactionsManager(
 -> std::unique_ptr<Reactions::Manager> {
 	return std::make_unique<Reactions::Manager>(
 		wheelEventsTarget,
-		std::move(update),
-		_window->cachedReactionIconFactory().createMethod());
+		std::move(update));
 }
 
 void WindowListDelegate::listVisibleAreaUpdated() {
@@ -2780,8 +2779,7 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			desiredPosition,
 			reactItem,
 			[=](ChosenReaction reaction) { reactionChosen(reaction); },
-			ItemReactionsAbout(reactItem),
-			controller()->cachedReactionIconFactory().createMethod())
+			ItemReactionsAbout(reactItem))
 		: AttachSelectorResult::Skipped;
 	if (attached == AttachSelectorResult::Failed) {
 		_menu = nullptr;
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
index 136a3f73c28f9..83891717c6270 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
@@ -69,6 +69,7 @@ bool CanScheduleUntilOnline(not_null<PeerData*> peer) {
 
 void ScheduleBox(
 		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
 		SendMenu::Type type,
 		Fn<void(Api::SendOptions)> done,
 		TimeId time,
@@ -98,6 +99,7 @@ void ScheduleBox(
 	using T = SendMenu::Type;
 	SendMenu::SetupMenuAndShortcuts(
 		descriptor.submit.data(),
+		show,
 		[t = type == T::Disabled ? T::Disabled : T::SilentOnly] { return t; },
 		[=] { save(true, descriptor.collect()); },
 		nullptr,
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.h b/Telegram/SourceFiles/history/view/history_view_schedule_box.h
index 5d72ed05f507f..72c2b4b892a1d 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.h
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.h
@@ -18,6 +18,10 @@ namespace Api {
 struct SendOptions;
 } // namespace Api
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace SendMenu {
 enum class Type;
 } // namespace SendMenu
@@ -36,6 +40,7 @@ struct ScheduleBoxStyleArgs {
 
 void ScheduleBox(
 	not_null<Ui::GenericBox*> box,
+	std::shared_ptr<ChatHelpers::Show> show,
 	SendMenu::Type type,
 	Fn<void(Api::SendOptions)> done,
 	TimeId time,
@@ -44,12 +49,14 @@ void ScheduleBox(
 template <typename Guard, typename Submit>
 [[nodiscard]] object_ptr<Ui::GenericBox> PrepareScheduleBox(
 		Guard &&guard,
+		std::shared_ptr<ChatHelpers::Show> show,
 		SendMenu::Type type,
 		Submit &&submit,
 		TimeId scheduleTime = DefaultScheduleTime(),
 		ScheduleBoxStyleArgs style = ScheduleBoxStyleArgs()) {
 	return Box(
 		ScheduleBox,
+		std::move(show),
 		type,
 		crl::guard(std::forward<Guard>(guard), std::forward<Submit>(submit)),
 		scheduleTime,
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 3fe205b3c328b..e0522acb0bf4f 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -98,6 +98,7 @@ ScheduledWidget::ScheduledWidget(
 	const Data::ForumTopic *forumTopic)
 : Window::SectionWidget(parent, controller, history->peer)
 , WindowListDelegate(controller)
+, _show(controller->uiShow())
 , _history(history)
 , _forumTopic(forumTopic)
 , _scroll(
@@ -600,7 +601,8 @@ void ScheduledWidget::uploadFile(
 			type,
 			prepareSendAction(options));
 	};
-	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
+	controller()->show(
+		PrepareScheduleBox(this, _show, sendMenuType(), callback));
 }
 
 bool ScheduledWidget::showSendingFilesError(
@@ -678,7 +680,8 @@ void ScheduledWidget::send() {
 		return;
 	}
 	const auto callback = [=](Api::SendOptions options) { send(options); };
-	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
+	controller()->show(
+		PrepareScheduleBox(this, _show, sendMenuType(), callback));
 }
 
 void ScheduledWidget::send(Api::SendOptions options) {
@@ -709,7 +712,8 @@ void ScheduledWidget::sendVoice(
 	const auto callback = [=](Api::SendOptions options) {
 		sendVoice(bytes, waveform, duration, options);
 	};
-	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
+	controller()->show(
+		PrepareScheduleBox(this, _show, sendMenuType(), callback));
 }
 
 void ScheduledWidget::sendVoice(
@@ -809,7 +813,8 @@ void ScheduledWidget::sendExistingDocument(
 	const auto callback = [=](Api::SendOptions options) {
 		sendExistingDocument(document, options);
 	};
-	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
+	controller()->show(
+		PrepareScheduleBox(this, _show, sendMenuType(), callback));
 }
 
 bool ScheduledWidget::sendExistingDocument(
@@ -838,7 +843,8 @@ void ScheduledWidget::sendExistingPhoto(not_null<PhotoData*> photo) {
 	const auto callback = [=](Api::SendOptions options) {
 		sendExistingPhoto(photo, options);
 	};
-	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
+	controller()->show(
+		PrepareScheduleBox(this, _show, sendMenuType(), callback));
 }
 
 bool ScheduledWidget::sendExistingPhoto(
@@ -872,7 +878,8 @@ void ScheduledWidget::sendInlineResult(
 	const auto callback = [=](Api::SendOptions options) {
 		sendInlineResult(result, bot, options);
 	};
-	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
+	controller()->show(
+		PrepareScheduleBox(this, _show, sendMenuType(), callback));
 }
 
 void ScheduledWidget::sendInlineResult(
@@ -1360,7 +1367,8 @@ void ScheduledWidget::listSendBotCommand(
 		message.textWithTags = { text };
 		session().api().sendMessage(std::move(message));
 	};
-	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
+	controller()->show(
+		PrepareScheduleBox(this, _show, sendMenuType(), callback));
 }
 
 void ScheduledWidget::listSearch(
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 9f181d231cbd6..cb5ead98f06d1 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -17,6 +17,10 @@ class History;
 enum class SendMediaType;
 struct SendingAlbum;
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace SendMenu {
 enum class Type;
 } // namespace SendMenu
@@ -262,6 +266,7 @@ class ScheduledWidget final
 		not_null<UserData*> bot,
 		Api::SendOptions options);
 
+	const std::shared_ptr<ChatHelpers::Show> _show;
 	const not_null<History*> _history;
 	const Data::ForumTopic *_forumTopic;
 	std::shared_ptr<Ui::ChatTheme> _theme;
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.h
index 495f33847dd1d..4a1842d995f63 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.h
@@ -138,7 +138,7 @@ class Manager final : public base::has_weak_ptr {
 	Manager(
 		QWidget *wheelEventsTarget,
 		Fn<void(QRect)> buttonUpdate,
-		IconFactory iconFactory);
+		IconFactory iconFactory = nullptr);
 	~Manager();
 
 	using ReactionId = ::Data::ReactionId;
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index cce557ffcb39d..61c46a1578ff9 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -200,8 +200,8 @@ Selector::Selector(
 	std::shared_ptr<ChatHelpers::Show> show,
 	const Data::PossibleItemReactionsRef &reactions,
 	TextWithEntities about,
-	IconFactory iconFactory,
 	Fn<void(bool fast)> close,
+	IconFactory iconFactory,
 	bool child)
 : Selector(
 	parent,
@@ -261,14 +261,12 @@ Selector::Selector(
 	QSize(2 * st::reactStripSkip + st::reactStripSize, st::reactStripHeight),
 	st::reactionCornerShadow,
 	st::reactStripHeight)
-, _strip(iconFactory
-	? std::make_unique<Strip>(
-		_st,
-		QRect(0, 0, st::reactStripSize, st::reactStripSize),
-		st::reactStripImage,
-		crl::guard(this, [=] { update(_inner); }),
-		std::move(iconFactory))
-	: nullptr)
+, _strip(std::make_unique<Strip>(
+	_st,
+	QRect(0, 0, st::reactStripSize, st::reactStripSize),
+	st::reactStripImage,
+	crl::guard(this, [=] { update(_inner); }),
+	std::move(iconFactory)))
 , _about(about.empty()
 	? nullptr
 	: std::make_unique<Ui::FlatLabel>(
@@ -1221,8 +1219,8 @@ auto AttachSelectorToMenu(
 		std::move(show),
 		std::move(reactions),
 		std::move(about),
-		std::move(iconFactory),
 		[=](bool fast) { menu->hideMenu(fast); },
+		std::move(iconFactory),
 		false); // child
 	if (!AdjustMenuGeometryForSelector(menu, desiredPosition, selector)) {
 		return base::make_unexpected(AttachSelectorResult::Failed);
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
index 1d136c15b1101..cb9b8a68f4226 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -82,8 +82,8 @@ class Selector final : public Ui::RpWidget {
 		std::shared_ptr<ChatHelpers::Show> show,
 		const Data::PossibleItemReactionsRef &reactions,
 		TextWithEntities about,
-		IconFactory iconFactory,
 		Fn<void(bool fast)> close,
+		IconFactory iconFactory = nullptr,
 		bool child = false);
 	Selector(
 		not_null<QWidget*> parent,
@@ -253,7 +253,7 @@ AttachSelectorResult AttachSelectorToMenu(
 	not_null<HistoryItem*> item,
 	Fn<void(ChosenReaction)> chosen,
 	TextWithEntities about,
-	IconFactory iconFactory);
+	IconFactory iconFactory = nullptr);
 
 [[nodiscard]] auto AttachSelectorToMenu(
 	not_null<Ui::PopupMenu*> menu,
@@ -262,7 +262,7 @@ AttachSelectorResult AttachSelectorToMenu(
 	std::shared_ptr<ChatHelpers::Show> show,
 	const Data::PossibleItemReactionsRef &reactions,
 	TextWithEntities about,
-	IconFactory iconFactory
+	IconFactory iconFactory = nullptr
 ) -> base::expected<not_null<Selector*>, AttachSelectorResult>;
 
 [[nodiscard]] TextWithEntities ItemReactionsAbout(
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
index 7f36f6630919c..08524c1801532 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
@@ -51,7 +51,9 @@ Strip::Strip(
 	Fn<void()> update,
 	IconFactory iconFactory)
 : _st(st)
-, _iconFactory(std::move(iconFactory))
+, _iconFactory(iconFactory
+	? std::move(iconFactory)
+	: DefaultCachingIconFactory)
 , _inner(inner)
 , _finalSize(size)
 , _update(std::move(update)) {
@@ -558,4 +560,11 @@ std::shared_ptr<Ui::AnimatedIcon> DefaultIconFactory(
 	return CreateIcon(media, size);
 }
 
+std::shared_ptr<Ui::AnimatedIcon> DefaultCachingIconFactory(
+		not_null<Data::DocumentMedia*> media,
+		int size) {
+	auto &factory = media->owner()->session().cachedReactionIconFactory();
+	return factory.createMethod()(media, size);
+}
+
 } // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h
index f11ea7253e04e..7ae2d0dd2d685 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h
@@ -53,7 +53,7 @@ class Strip final {
 		QRect inner,
 		int size,
 		Fn<void()> update,
-		IconFactory iconFactory);
+		IconFactory iconFactory = nullptr);
 
 	enum class AddedButton : uchar {
 		None,
@@ -173,4 +173,8 @@ class CachedIconFactory final {
 	not_null<Data::DocumentMedia*> media,
 	int size);
 
+[[nodiscard]] std::shared_ptr<Ui::AnimatedIcon> DefaultCachingIconFactory(
+	not_null<Data::DocumentMedia*> media,
+	int size);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index 1449d9497c3db..aa70700ece1ec 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -20,6 +20,7 @@ For license and copyright information please follow this link:
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "chat_helpers/stickers_dice_pack.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
+#include "history/view/reactions/history_view_reactions_strip.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "inline_bots/bot_attach_web_view.h"
@@ -104,6 +105,7 @@ Session::Session(
 , _scheduledMessages(std::make_unique<Data::ScheduledMessages>(this))
 , _sponsoredMessages(std::make_unique<Data::SponsoredMessages>(this))
 , _topPeers(std::make_unique<Data::TopPeers>(this))
+, _cachedReactionIconFactory(std::make_unique<ReactionIconFactory>())
 , _supportHelper(Support::Helper::Create(this))
 , _saveSettingsTimer([=] { saveSettings(); }) {
 	Expects(_settings != nullptr);
diff --git a/Telegram/SourceFiles/main/main_session.h b/Telegram/SourceFiles/main/main_session.h
index daab53632be0a..8d1b276ecb1fe 100644
--- a/Telegram/SourceFiles/main/main_session.h
+++ b/Telegram/SourceFiles/main/main_session.h
@@ -37,6 +37,10 @@ class SponsoredMessages;
 class TopPeers;
 } // namespace Data
 
+namespace HistoryView::Reactions {
+class CachedIconFactory;
+} // namespace HistoryView::Reactions
+
 namespace Storage {
 class DownloadManagerMtproto;
 class Uploader;
@@ -156,6 +160,10 @@ class Session final : public base::has_weak_ptr {
 	[[nodiscard]] InlineBots::AttachWebView &attachWebView() const {
 		return *_attachWebView;
 	}
+	[[nodiscard]] auto cachedReactionIconFactory() const
+	-> HistoryView::Reactions::CachedIconFactory & {
+		return *_cachedReactionIconFactory;
+	}
 
 	void saveSettings();
 	void saveSettingsDelayed(crl::time delay = kDefaultSaveDelay);
@@ -217,8 +225,6 @@ class Session final : public base::has_weak_ptr {
 private:
 	static constexpr auto kDefaultSaveDelay = crl::time(1000);
 
-	void parseColorIndices(const MTPDhelp_peerColors &data);
-
 	const UserId _userId;
 	const not_null<Account*> _account;
 
@@ -246,6 +252,9 @@ class Session final : public base::has_weak_ptr {
 	const std::unique_ptr<Data::SponsoredMessages> _sponsoredMessages;
 	const std::unique_ptr<Data::TopPeers> _topPeers;
 
+	using ReactionIconFactory = HistoryView::Reactions::CachedIconFactory;
+	const std::unique_ptr<ReactionIconFactory> _cachedReactionIconFactory;
+
 	const std::unique_ptr<Support::Helper> _supportHelper;
 
 	std::shared_ptr<QImage> _selfUserpicView;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 39b3f45ff1ba5..04c06e1970ed5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -679,11 +679,6 @@ auto Controller::stickerOrEmojiChosen() const
 	return _delegate->storiesStickerOrEmojiChosen();
 }
 
-auto Controller::cachedReactionIconFactory() const
--> HistoryView::Reactions::CachedIconFactory & {
-	return _delegate->storiesCachedReactionIconFactory();
-}
-
 void Controller::rebuildFromContext(
 		not_null<PeerData*> peer,
 		FullStoryId storyId) {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index b3d7968829c93..776667f736097 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -30,7 +30,6 @@ class DocumentMedia;
 } // namespace Data
 
 namespace HistoryView::Reactions {
-class CachedIconFactory;
 struct ChosenReaction;
 enum class AttachSelectorResult;
 } // namespace HistoryView::Reactions
@@ -137,8 +136,6 @@ class Controller final : public base::has_weak_ptr {
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
 	[[nodiscard]] auto stickerOrEmojiChosen() const
 	-> rpl::producer<ChatHelpers::FileChosen>;
-	[[nodiscard]] auto cachedReactionIconFactory() const
-		-> HistoryView::Reactions::CachedIconFactory &;
 
 	void show(not_null<Data::Story*> story, Data::StoriesContext context);
 	void jumpTo(not_null<Data::Story*> story, Data::StoriesContext context);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index d1a06a52eb05e..c453177cbccc5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -17,10 +17,6 @@ class Story;
 struct StoriesContext;
 } // namespace Data
 
-namespace HistoryView::Reactions {
-class CachedIconFactory;
-} // namespace HistoryView::Reactions
-
 namespace Main {
 class Session;
 } // namespace Main
@@ -48,8 +44,6 @@ class Delegate {
 		-> std::shared_ptr<ChatHelpers::Show> = 0;
 	[[nodiscard]] virtual auto storiesStickerOrEmojiChosen()
 		-> rpl::producer<ChatHelpers::FileChosen> = 0;
-	[[nodiscard]] virtual auto storiesCachedReactionIconFactory()
-		-> HistoryView::Reactions::CachedIconFactory & = 0;
 	virtual void storiesRedisplay(not_null<Data::Story*> story) = 0;
 	virtual void storiesJumpTo(
 		not_null<Main::Session*> session,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index da07a1516cbb1..724533e58a81c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -667,7 +667,6 @@ void Reactions::Panel::create() {
 		TextWithEntities{ (mode == Mode::Message
 			? tr::lng_stories_reaction_as_message(tr::now)
 			: QString()) },
-		_controller->cachedReactionIconFactory().createMethod(),
 		[=](bool fast) { hide(mode); });
 
 	_selector->chosen(
@@ -867,8 +866,7 @@ auto Reactions::attachToMenu(
 		st::storiesReactionsPan,
 		show,
 		LookupPossibleReactions(&show->session()),
-		TextWithEntities(),
-		_controller->cachedReactionIconFactory().createMethod());
+		TextWithEntities());
 	if (!result) {
 		return result.error();
 	}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index cfa414afe0918..94dede7e90943 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -415,7 +415,6 @@ OverlayWidget::OverlayWidget()
 , _widget(_surface->rpWidget())
 , _fullscreen(Core::App().settings().mediaViewPosition().maximized == 2)
 , _windowed(Core::App().settings().mediaViewPosition().maximized == 0)
-, _cachedReactionIconFactory(std::make_unique<ReactionIconFactory>())
 , _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)
@@ -4295,11 +4294,6 @@ auto OverlayWidget::storiesStickerOrEmojiChosen()
 	return _storiesStickerOrEmojiChosen.events();
 }
 
-auto OverlayWidget::storiesCachedReactionIconFactory()
--> HistoryView::Reactions::CachedIconFactory & {
-	return *_cachedReactionIconFactory;
-}
-
 void OverlayWidget::storiesJumpTo(
 		not_null<Main::Session*> session,
 		FullStoryId id,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 94a7e7b2f323a..02bdca5fb007b 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -55,10 +55,6 @@ namespace Window::Theme {
 struct Preview;
 } // namespace Window::Theme
 
-namespace HistoryView::Reactions {
-class CachedIconFactory;
-} // namespace HistoryView::Reactions
-
 namespace Media::Player {
 struct TrackState;
 } // namespace Media::Player
@@ -251,8 +247,6 @@ class OverlayWidget final
 	std::shared_ptr<ChatHelpers::Show> storiesShow() override;
 	auto storiesStickerOrEmojiChosen()
 		-> rpl::producer<ChatHelpers::FileChosen> override;
-	auto storiesCachedReactionIconFactory()
-		-> HistoryView::Reactions::CachedIconFactory & override;
 	void storiesRedisplay(not_null<Data::Story*> story) override;
 	void storiesJumpTo(
 		not_null<Main::Session*> session,
@@ -629,8 +623,6 @@ class OverlayWidget final
 	bool _showAsPip = false;
 
 	std::unique_ptr<Stories::View> _stories;
-	using ReactionIconFactory = HistoryView::Reactions::CachedIconFactory;
-	std::unique_ptr<ReactionIconFactory> _cachedReactionIconFactory;
 	std::shared_ptr<Show> _cachedShow;
 	rpl::event_stream<> _storiesChanged;
 	Main::Session *_storiesSession = nullptr;
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index a31fcf103753e..1a1b09757dcb9 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -10,13 +10,16 @@ For license and copyright information please follow this link:
 #include "api/api_common.h"
 #include "base/event_filter.h"
 #include "boxes/abstract_box.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "core/shortcuts.h"
+#include "history/view/reactions/history_view_reactions_selector.h"
 #include "history/view/history_view_schedule_box.h"
 #include "lang/lang_keys.h"
 #include "ui/widgets/popup_menu.h"
 #include "data/data_peer.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
+#include "data/data_message_reactions.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
 #include "history/history.h"
@@ -28,19 +31,51 @@ For license and copyright information please follow this link:
 #include <QtWidgets/QApplication>
 
 namespace SendMenu {
+namespace {
+
+[[nodiscard]] Data::PossibleItemReactionsRef LookupPossibleEffects(
+		not_null<Main::Session*> session) {
+	auto result = Data::PossibleItemReactionsRef();
+	const auto reactions = &session->data().reactions();
+	const auto &full = reactions->list(Data::Reactions::Type::Active);
+	const auto &top = reactions->list(Data::Reactions::Type::Top);
+	const auto &recent = reactions->list(Data::Reactions::Type::Recent);
+	const auto premiumPossible = session->premiumPossible();
+	auto added = base::flat_set<Data::ReactionId>();
+	result.recent.reserve(full.size());
+	for (const auto &reaction : ranges::views::concat(top, recent, full)) {
+		if (premiumPossible || !reaction.id.custom()) {
+			if (added.emplace(reaction.id).second) {
+				result.recent.push_back(&reaction);
+			}
+		}
+	}
+	result.customAllowed = premiumPossible;
+	const auto i = ranges::find(
+		result.recent,
+		reactions->favoriteId(),
+		&Data::Reaction::id);
+	if (i != end(result.recent) && i != begin(result.recent)) {
+		std::rotate(begin(result.recent), i, i + 1);
+	}
+	return result;
+}
+
+} // namespace
 
 Fn<void()> DefaultSilentCallback(Fn<void(Api::SendOptions)> send) {
 	return [=] { send({ .silent = true }); };
 }
 
 Fn<void()> DefaultScheduleCallback(
-		std::shared_ptr<Ui::Show> show,
+		std::shared_ptr<ChatHelpers::Show> show,
 		Type type,
 		Fn<void(Api::SendOptions)> send) {
 	return [=, weak = Ui::MakeWeak(show->toastParent())] {
 		show->showBox(
 			HistoryView::PrepareScheduleBox(
 				weak,
+				show,
 				type,
 				[=](Api::SendOptions options) { send(options); }),
 			Ui::LayerOption::KeepOther);
@@ -95,6 +130,7 @@ FillMenuResult FillSendMenu(
 
 void SetupMenuAndShortcuts(
 		not_null<Ui::RpWidget*> button,
+		std::shared_ptr<ChatHelpers::Show> show,
 		Fn<Type()> type,
 		Fn<void()> silent,
 		Fn<void()> schedule,
@@ -107,12 +143,35 @@ void SetupMenuAndShortcuts(
 		*menu = base::make_unique_q<Ui::PopupMenu>(
 			button,
 			st::popupMenuWithIcons);
-		const auto result = FillSendMenu(*menu, type(), silent, schedule, whenOnline);
-		const auto success = (result == FillMenuResult::Success);
-		if (success) {
-			(*menu)->popup(QCursor::pos());
+		const auto result = FillSendMenu(
+			*menu,
+			type(),
+			silent,
+			schedule,
+			whenOnline);
+		if (result != FillMenuResult::Success) {
+			return false;
+		}
+		const auto desiredPosition = QCursor::pos();
+		using namespace HistoryView::Reactions;
+		const auto selector = show
+			? AttachSelectorToMenu(
+				menu->get(),
+				desiredPosition,
+				st::reactPanelEmojiPan,
+				show,
+				LookupPossibleEffects(&show->session()),
+				{ tr::lng_effect_add_title(tr::now) })
+			: base::make_unexpected(AttachSelectorResult::Skipped);
+		if (selector) {
+			//(*selector)->chosen();
+			(*menu)->popupPrepared();
+		} else if (selector.error() == AttachSelectorResult::Failed) {
+			return false;
+		} else {
+			(*menu)->popup(desiredPosition);
 		}
-		return success;
+		return true;
 	};
 	base::install_event_filter(button, [=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::ContextMenu && showMenu()) {
diff --git a/Telegram/SourceFiles/menu/menu_send.h b/Telegram/SourceFiles/menu/menu_send.h
index 03b7f7ec515e5..250ac1e773cc2 100644
--- a/Telegram/SourceFiles/menu/menu_send.h
+++ b/Telegram/SourceFiles/menu/menu_send.h
@@ -15,6 +15,10 @@ namespace Api {
 struct SendOptions;
 } // namespace Api
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Ui {
 class PopupMenu;
 class RpWidget;
@@ -42,7 +46,7 @@ enum class FillMenuResult {
 
 Fn<void()> DefaultSilentCallback(Fn<void(Api::SendOptions)> send);
 Fn<void()> DefaultScheduleCallback(
-	std::shared_ptr<Ui::Show> show,
+	std::shared_ptr<ChatHelpers::Show> show,
 	Type type,
 	Fn<void(Api::SendOptions)> send);
 Fn<void()> DefaultWhenOnlineCallback(Fn<void(Api::SendOptions)> send);
@@ -57,6 +61,7 @@ FillMenuResult FillSendMenu(
 
 void SetupMenuAndShortcuts(
 	not_null<Ui::RpWidget*> button,
+	std::shared_ptr<ChatHelpers::Show> show,
 	Fn<Type()> type,
 	Fn<void()> silent,
 	Fn<void()> schedule,
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 0162d71697aaa..d611652f73c58 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -22,7 +22,7 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.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_button.h"
 #include "history/view/history_view_replies_section.h"
 #include "history/view/history_view_scheduled_section.h"
 #include "media/player/media_player_instance.h"
@@ -58,6 +58,7 @@ For license and copyright information please follow this link:
 #include "ui/text/format_values.h" // Ui::FormatPhone.
 #include "ui/delayed_activation.h"
 #include "ui/boxes/boost_box.h"
+#include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/effects/message_sending_animation_controller.h"
 #include "ui/style/style_palette_colorizer.h"
@@ -1190,7 +1191,6 @@ SessionController::SessionController(
 , _activeChatsFilter(session->data().chatsFilters().defaultId())
 , _defaultChatTheme(std::make_shared<Ui::ChatTheme>())
 , _chatStyle(std::make_unique<Ui::ChatStyle>(session->colorIndicesValue()))
-, _cachedReactionIconFactory(std::make_unique<ReactionIconFactory>())
 , _giftPremiumValidator(this) {
 	init();
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 9888dc1c4c27b..38085b945641d 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -593,11 +593,6 @@ class SessionController : public SessionNavigation {
 		return _chatStyle.get();
 	}
 
-	[[nodiscard]] auto cachedReactionIconFactory() const
-	-> HistoryView::Reactions::CachedIconFactory & {
-		return *_cachedReactionIconFactory;
-	}
-
 	[[nodiscard]] QString authedName() const {
 		return _authedName;
 	}
@@ -713,9 +708,6 @@ class SessionController : public SessionNavigation {
 	std::deque<std::shared_ptr<Ui::ChatTheme>> _lastUsedCustomChatThemes;
 	rpl::variable<PeerThemeOverride> _peerThemeOverride;
 
-	using ReactionIconFactory = HistoryView::Reactions::CachedIconFactory;
-	std::unique_ptr<ReactionIconFactory> _cachedReactionIconFactory;
-
 	base::has_weak_ptr _storyOpenGuard;
 
 	GiftPremiumValidator _giftPremiumValidator;

From d1106e5ae66a30baf21004755ea123f0d5b01d39 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 10 May 2024 14:10:53 +0400
Subject: [PATCH 173/400] Check effects availability in all SendMenu-s.

---
 .../SourceFiles/boxes/create_poll_box.cpp     |  43 ++---
 Telegram/SourceFiles/boxes/create_poll_box.h  |   6 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  53 +++---
 Telegram/SourceFiles/boxes/send_files_box.h   |  12 +-
 Telegram/SourceFiles/boxes/share_box.cpp      |  43 +++--
 Telegram/SourceFiles/boxes/share_box.h        |   6 +-
 .../SourceFiles/boxes/sticker_set_box.cpp     |  15 +-
 Telegram/SourceFiles/boxes/sticker_set_box.h  |   4 -
 .../chat_helpers/compose/compose_show.h       |   4 +-
 .../chat_helpers/emoji_list_widget.cpp        |   2 +-
 .../chat_helpers/emoji_list_widget.h          |   2 +-
 .../chat_helpers/field_autocomplete.cpp       |  33 ++--
 .../chat_helpers/field_autocomplete.h         |   4 +-
 .../chat_helpers/gifs_list_widget.cpp         |  14 +-
 .../chat_helpers/gifs_list_widget.h           |   4 +-
 .../chat_helpers/stickers_list_widget.cpp     |  13 +-
 .../chat_helpers/stickers_list_widget.h       |   2 +-
 .../chat_helpers/tabbed_selector.cpp          |   4 +-
 .../chat_helpers/tabbed_selector.h            |   6 +-
 .../data/data_message_reactions.cpp           |   5 +-
 .../SourceFiles/history/history_widget.cpp    |  61 ++++---
 Telegram/SourceFiles/history/history_widget.h |   8 +-
 .../history_view_compose_controls.cpp         |  30 ++--
 .../controls/history_view_compose_controls.h  |  10 +-
 .../view/history_view_context_menu.cpp        |   2 +-
 .../view/history_view_replies_section.cpp     |  15 +-
 .../view/history_view_replies_section.h       |   4 +-
 .../view/history_view_schedule_box.cpp        |  28 ++-
 .../history/view/history_view_schedule_box.h  |   8 +-
 .../view/history_view_scheduled_section.cpp   |  24 +--
 .../view/history_view_scheduled_section.h     |   4 +-
 .../history_view_reactions_selector.cpp       |  23 ++-
 .../history_view_reactions_selector.h         |   2 +-
 .../info_profile_emoji_status_panel.cpp       |   2 +-
 .../inline_bots/bot_attach_web_view.cpp       |   2 +-
 .../inline_bots/inline_results_inner.cpp      |  22 +--
 .../inline_bots/inline_results_inner.h        |   6 +-
 .../inline_bots/inline_results_widget.cpp     |   4 +-
 .../inline_bots/inline_results_widget.h       |   4 +-
 Telegram/SourceFiles/mainwidget.cpp           |   4 +-
 Telegram/SourceFiles/mainwidget.h             |   4 +-
 .../media/stories/media_stories_reply.cpp     |  13 +-
 .../media/stories/media_stories_reply.h       |   6 +
 .../media/view/media_view_overlay_widget.cpp  |   4 +-
 Telegram/SourceFiles/menu/menu_send.cpp       | 166 ++++++++----------
 Telegram/SourceFiles/menu/menu_send.h         |  36 ++--
 .../business/settings_shortcut_messages.cpp   |  11 +-
 .../SourceFiles/window/window_peer_menu.cpp   |  21 +--
 .../SourceFiles/window/window_peer_menu.h     |   2 +-
 .../window/window_session_controller.cpp      |   8 +-
 50 files changed, 393 insertions(+), 416 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index c7de2a065ebda..8b032b81aeda6 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -910,12 +910,12 @@ CreatePollBox::CreatePollBox(
 	PollData::Flags chosen,
 	PollData::Flags disabled,
 	Api::SendType sendType,
-	SendMenu::Type sendMenuType)
+	SendMenu::Details sendMenuDetails)
 : _controller(controller)
 , _chosen(chosen)
 , _disabled(disabled)
 , _sendType(sendType)
-, _sendMenuType(sendMenuType) {
+, _sendMenuDetails([result = sendMenuDetails] { return result; }) {
 }
 
 rpl::producer<CreatePollBox::Result> CreatePollBox::submitRequests() const {
@@ -1288,20 +1288,9 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			_submitRequests.fire({ collectResult(), sendOptions });
 		}
 	};
-	const auto sendSilent = [=] {
-		send({ .silent = true });
-	};
-	const auto sendScheduled = [=] {
-		_controller->show(
-			HistoryView::PrepareScheduleBox(
-				this,
-				_controller->uiShow(),
-				SendMenu::Type::Scheduled,
-				send));
-	};
-	const auto sendWhenOnline = [=] {
-		send(Api::DefaultSendWhenOnlineOptions());
-	};
+	const auto sendAction = SendMenu::DefaultCallback(
+		_controller->uiShow(),
+		crl::guard(this, send));
 
 	options->scrollToWidget(
 	) | rpl::start_with_next([=](not_null<QWidget*> widget) {
@@ -1314,25 +1303,23 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 	}, lifetime());
 
 	const auto isNormal = (_sendType == Api::SendType::Normal);
-
+	const auto schedule = [=] {
+		sendAction(SendMenu::ActionType::Schedule, _sendMenuDetails());
+	};
 	const auto submit = addButton(
-		isNormal
+		(isNormal
 			? tr::lng_polls_create_button()
-			: tr::lng_schedule_button(),
-		[=] { isNormal ? send({}) : sendScheduled(); });
-	const auto sendMenuType = [=] {
+			: tr::lng_schedule_button()),
+		[=] { isNormal ? send({}) : schedule(); });
+	const auto sendMenuDetails = [=] {
 		collectError();
-		return (*error)
-			? SendMenu::Type::Disabled
-			: _sendMenuType;
+		return (*error) ? SendMenu::Details() : _sendMenuDetails();
 	};
 	SendMenu::SetupMenuAndShortcuts(
 		submit.data(),
 		_controller->uiShow(),
-		sendMenuType,
-		sendSilent,
-		sendScheduled,
-		sendWhenOnline);
+		sendMenuDetails,
+		sendAction);
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 
 	return result;
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.h b/Telegram/SourceFiles/boxes/create_poll_box.h
index 91805f0d8bde0..91fc290ca409b 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.h
+++ b/Telegram/SourceFiles/boxes/create_poll_box.h
@@ -27,7 +27,7 @@ class SessionController;
 } // namespace Window
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 class CreatePollBox : public Ui::BoxContent {
@@ -43,7 +43,7 @@ class CreatePollBox : public Ui::BoxContent {
 		PollData::Flags chosen,
 		PollData::Flags disabled,
 		Api::SendType sendType,
-		SendMenu::Type sendMenuType);
+		SendMenu::Details sendMenuDetails);
 
 	[[nodiscard]] rpl::producer<Result> submitRequests() const;
 	void submitFailed(const QString &error);
@@ -75,7 +75,7 @@ class CreatePollBox : public Ui::BoxContent {
 	const PollData::Flags _chosen = PollData::Flags();
 	const PollData::Flags _disabled = PollData::Flags();
 	const Api::SendType _sendType = Api::SendType();
-	const SendMenu::Type _sendMenuType;
+	const Fn<SendMenu::Details()> _sendMenuDetails;
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	Fn<void()> _setInnerFocus;
 	Fn<rpl::producer<bool>()> _dataIsValidValue;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 8e1280f89c569..6ba4771f8b135 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -328,7 +328,7 @@ SendFilesBox::SendFilesBox(
 	const TextWithTags &caption,
 	not_null<PeerData*> toPeer,
 	Api::SendType sendType,
-	SendMenu::Type sendMenuType)
+	SendMenu::Details sendMenuDetails)
 : SendFilesBox(nullptr, {
 	.show = controller->uiShow(),
 	.list = std::move(list),
@@ -337,7 +337,7 @@ SendFilesBox::SendFilesBox(
 	.limits = DefaultLimitsForPeer(toPeer),
 	.check = DefaultCheckForPeer(controller, toPeer),
 	.sendType = sendType,
-	.sendMenuType = sendMenuType,
+	.sendMenuDetails = [=] { return sendMenuDetails; },
 }) {
 }
 
@@ -350,7 +350,9 @@ SendFilesBox::SendFilesBox(QWidget*, SendFilesBoxDescriptor &&descriptor)
 , _titleHeight(st::boxTitleHeight)
 , _list(std::move(descriptor.list))
 , _limits(descriptor.limits)
-, _sendMenuType(descriptor.sendMenuType)
+, _sendMenuDetails(descriptor.sendMenuDetails
+	? descriptor.sendMenuDetails
+	: [] { return SendMenu::Details(); })
 , _captionToPeer(descriptor.captionToPeer)
 , _check(std::move(descriptor.check))
 , _confirmedCallback(std::move(descriptor.confirmed))
@@ -530,10 +532,8 @@ void SendFilesBox::refreshButtons() {
 		SendMenu::SetupMenuAndShortcuts(
 			_send,
 			_show,
-			[=] { return _sendMenuType; },
-			[=] { sendSilent(); },
-			[=] { sendScheduled(); },
-			[=] { sendWhenOnline(); });
+			_sendMenuDetails,
+			SendMenu::DefaultCallback(_show, sendCallback()));
 	}
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 	_addFile = addLeftButton(
@@ -546,7 +546,7 @@ void SendFilesBox::refreshButtons() {
 }
 
 bool SendFilesBox::hasSendMenu() const {
-	return (_sendMenuType != SendMenu::Type::Disabled);
+	return (_sendMenuDetails().type != SendMenu::Type::Disabled);
 }
 
 bool SendFilesBox::hasSpoilerMenu() const {
@@ -607,11 +607,11 @@ void SendFilesBox::addMenuButton() {
 		if (hasSendMenu()) {
 			SendMenu::FillSendMenu(
 				_menu.get(),
-				_sendMenuType,
-				[=] { sendSilent(); },
-				[=] { sendScheduled(); },
-				[=] { sendWhenOnline(); },
-				&_st.tabbed.icons);
+				_show,
+				_sendMenuDetails(),
+				SendMenu::DefaultCallback(_show, sendCallback()),
+				&_st.tabbed.icons,
+				QCursor::pos());
 		}
 		_menu->popup(QCursor::pos());
 		return true;
@@ -1426,7 +1426,9 @@ void SendFilesBox::send(
 	if ((_sendType == Api::SendType::Scheduled
 		|| _sendType == Api::SendType::ScheduledToUser)
 		&& !options.scheduled) {
-		return sendScheduled();
+		return SendMenu::DefaultCallback(_show, sendCallback())(
+			SendMenu::ActionType::Schedule,
+			_sendMenuDetails());
 	}
 	if (_preparing) {
 		_whenReadySend = [=] {
@@ -1464,25 +1466,10 @@ void SendFilesBox::send(
 	closeBox();
 }
 
-void SendFilesBox::sendSilent() {
-	send({ .silent = true });
-}
-
-void SendFilesBox::sendScheduled() {
-	const auto type = (_sendType == Api::SendType::ScheduledToUser)
-		? SendMenu::Type::ScheduledToUser
-		: _sendMenuType;
-	const auto callback = [=](Api::SendOptions options) { send(options); };
-	auto box = HistoryView::PrepareScheduleBox(this, _show, type, callback);
-	const auto weak = Ui::MakeWeak(box.data());
-	_show->showBox(std::move(box));
-	if (const auto strong = weak.data()) {
-		strong->setCloseByOutsideClick(false);
-	}
-}
-
-void SendFilesBox::sendWhenOnline() {
-	send(Api::DefaultSendWhenOnlineOptions());
+Fn<void(Api::SendOptions)> SendFilesBox::sendCallback() {
+	return crl::guard(this, [=](Api::SendOptions options) {
+		send(options, false);
+	});
 }
 
 SendFilesBox::~SendFilesBox() = default;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index af712eda1a922..f6de4a4f8d034 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -47,7 +47,7 @@ class SessionController;
 } // namespace Window
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace HistoryView::Controls {
@@ -96,7 +96,7 @@ struct SendFilesBoxDescriptor {
 	SendFilesLimits limits = {};
 	SendFilesCheck check;
 	Api::SendType sendType = {};
-	SendMenu::Type sendMenuType = {};
+	Fn<SendMenu::Details()> sendMenuDetails = nullptr;
 	const style::ComposeControls *stOverride = nullptr;
 	SendFilesConfirmed confirmed;
 	Fn<void()> cancelled;
@@ -115,7 +115,7 @@ class SendFilesBox : public Ui::BoxContent {
 		const TextWithTags &caption,
 		not_null<PeerData*> toPeer,
 		Api::SendType sendType,
-		SendMenu::Type sendMenuType);
+		SendMenu::Details sendMenuDetails);
 	SendFilesBox(QWidget*, SendFilesBoxDescriptor &&descriptor);
 
 	void setConfirmedCallback(SendFilesConfirmed callback) {
@@ -202,9 +202,7 @@ class SendFilesBox : public Ui::BoxContent {
 	void generatePreviewFrom(int fromBlock);
 
 	void send(Api::SendOptions options, bool ctrlShiftEnter = false);
-	void sendSilent();
-	void sendScheduled();
-	void sendWhenOnline();
+	[[nodiscard]] Fn<void(Api::SendOptions)> sendCallback();
 	void captionResized();
 	void saveSendWaySettings();
 
@@ -238,7 +236,7 @@ class SendFilesBox : public Ui::BoxContent {
 	std::optional<int> _removingIndex;
 
 	SendFilesLimits _limits = {};
-	SendMenu::Type _sendMenuType = {};
+	Fn<SendMenu::Details()> _sendMenuDetails = nullptr;
 	PeerData *_captionToPeer = nullptr;
 	SendFilesCheck _check;
 	SendFilesConfirmed _confirmedCallback;
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 2d9ba4d3a383f..3d42c5afe88bf 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -473,15 +473,18 @@ void ShareBox::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
-SendMenu::Type ShareBox::sendMenuType() const {
+SendMenu::Details ShareBox::sendMenuDetails() const {
 	const auto selected = _inner->selected();
-	return ranges::all_of(
+	const auto type = ranges::all_of(
 		selected | ranges::views::transform(&Data::Thread::peer),
 		HistoryView::CanScheduleUntilOnline)
 		? SendMenu::Type::ScheduledToUser
 		: (selected.size() == 1 && selected.front()->peer()->isSelf())
 		? SendMenu::Type::Reminder
 		: SendMenu::Type::Scheduled;
+
+	// We can't support effect here because we don't have ChatHelpers::Show.
+	return { .type = type, .effectAllowed = false };
 }
 
 void ShareBox::showMenu(not_null<Ui::RpWidget*> parent) {
@@ -518,15 +521,25 @@ void ShareBox::showMenu(not_null<Ui::RpWidget*> parent) {
 		_menu->addSeparator();
 	}
 
-	const auto result = SendMenu::FillSendMenu(
+	using namespace SendMenu;
+	const auto sendAction = crl::guard(this, [=](Action action, Details) {
+		const auto options = std::get_if<Api::SendOptions>(&action);
+		if (options || v::get<ActionType>(action) == ActionType::Send) {
+			submit(options ? *options : Api::SendOptions());
+		} else {
+			submitScheduled();
+		}
+	});
+	_menu->setForcedVerticalOrigin(Ui::PopupMenu::VerticalOrigin::Bottom);
+	const auto result = FillSendMenu(
 		_menu.get(),
-		sendMenuType(),
-		[=] { submitSilent(); },
-		[=] { submitScheduled(); },
-		[=] { submitWhenOnline(); });
-	const auto success = (result == SendMenu::FillMenuResult::Success);
-	if (_descriptor.forwardOptions.show || success) {
-		_menu->setForcedVerticalOrigin(Ui::PopupMenu::VerticalOrigin::Bottom);
+		nullptr, // showForEffect.
+		sendMenuDetails(),
+		sendAction);
+	if (result == SendMenu::FillMenuResult::Prepared) {
+		_menu->popupPrepared();
+	} else if (_descriptor.forwardOptions.show
+		&& result != SendMenu::FillMenuResult::Failed) {
 		_menu->popup(QCursor::pos());
 	}
 }
@@ -607,26 +620,18 @@ void ShareBox::submit(Api::SendOptions options) {
 	}
 }
 
-void ShareBox::submitSilent() {
-	submit({ .silent = true });
-}
-
 void ShareBox::submitScheduled() {
 	const auto callback = [=](Api::SendOptions options) { submit(options); };
 	uiShow()->showBox(
 		HistoryView::PrepareScheduleBox(
 			this,
 			nullptr, // ChatHelpers::Show for effect attachment.
-			sendMenuType(),
+			sendMenuDetails(),
 			callback,
 			HistoryView::DefaultScheduleTime(),
 			_descriptor.scheduleBoxStyle));
 }
 
-void ShareBox::submitWhenOnline() {
-	submit(Api::DefaultSendWhenOnlineOptions());
-}
-
 void ShareBox::copyLink() const {
 	if (const auto onstack = _descriptor.copyCallback) {
 		onstack();
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index 253a8228ea519..5e48430cd2fc0 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -24,7 +24,7 @@ struct PeerList;
 } // namespace style
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace Window {
@@ -130,13 +130,11 @@ class ShareBox final : public Ui::BoxContent {
 	void scrollAnimationCallback();
 
 	void submit(Api::SendOptions options);
-	void submitSilent();
 	void submitScheduled();
-	void submitWhenOnline();
 	void copyLink() const;
 	bool searchByUsername(bool useCache = false);
 
-	SendMenu::Type sendMenuType() const;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
 
 	void scrollTo(Ui::ScrollToRequest request);
 	void needSearchByUsername();
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index ac455512050c9..efd034843da2a 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -1014,7 +1014,7 @@ void StickerSetBox::Inner::contextMenuEvent(QContextMenuEvent *e) {
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
 		st::popupMenuWithIcons);
-	const auto type = _show->sendMenuType();
+	const auto details = _show->sendMenuDetails();
 	if (setType() == Data::StickersType::Emoji) {
 		if (const auto t = PrepareTextFromEmoji(_pack[index]); !t.empty()) {
 			_menu->addAction(tr::lng_mediaview_copy(tr::now), [=] {
@@ -1023,17 +1023,16 @@ void StickerSetBox::Inner::contextMenuEvent(QContextMenuEvent *e) {
 				}
 			}, &st::menuIconCopy);
 		}
-	} else if (type != SendMenu::Type::Disabled) {
+	} else if (details.type != SendMenu::Type::Disabled) {
 		const auto document = _pack[index];
-		const auto sendSelected = [=](Api::SendOptions options) {
+		const auto send = crl::guard(this, [=](Api::SendOptions options) {
 			chosen(index, document, options);
-		};
+		});
 		SendMenu::FillSendMenu(
 			_menu.get(),
-			type,
-			SendMenu::DefaultSilentCallback(sendSelected),
-			SendMenu::DefaultScheduleCallback(_show, type, sendSelected),
-			SendMenu::DefaultWhenOnlineCallback(sendSelected));
+			_show,
+			details,
+			SendMenu::DefaultCallback(_show, send));
 
 		const auto show = _show;
 		const auto toggleFavedSticker = [=] {
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.h b/Telegram/SourceFiles/boxes/sticker_set_box.h
index c57a1f484a75f..72dd38320a285 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.h
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.h
@@ -23,10 +23,6 @@ namespace Data {
 class StickersSet;
 } // namespace Data
 
-namespace SendMenu {
-enum class Type;
-} // namespace SendMenu
-
 namespace ChatHelpers {
 struct FileChosen;
 class Show;
diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_show.h b/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
index 7dcbab5135956..28fc7ff47a269 100644
--- a/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
@@ -22,7 +22,7 @@ class SessionController;
 } // namespace Window
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace ChatHelpers {
@@ -57,7 +57,7 @@ class Show : public Main::SessionShow {
 	[[nodiscard]] virtual rpl::producer<> pauseChanged() const = 0;
 
 	[[nodiscard]] virtual rpl::producer<bool> adjustShadowLeft() const;
-	[[nodiscard]] virtual SendMenu::Type sendMenuType() const = 0;
+	[[nodiscard]] virtual SendMenu::Details sendMenuDetails() const = 0;
 
 	virtual bool showMediaPreview(
 		Data::FileOrigin origin,
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index a5b72ca7ba4e4..8482d8b8142d0 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -1104,7 +1104,7 @@ void EmojiListWidget::fillRecentFrom(const std::vector<DocumentId> &list) {
 }
 
 base::unique_qptr<Ui::PopupMenu> EmojiListWidget::fillContextMenu(
-		SendMenu::Type type) {
+		const SendMenu::Details &details) {
 	if (v::is_null(_selected)) {
 		return nullptr;
 	}
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index 3159d340e08e2..219add05bd175 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -144,7 +144,7 @@ class EmojiListWidget final
 		RectPart origin);
 
 	base::unique_qptr<Ui::PopupMenu> fillContextMenu(
-		SendMenu::Type type) override;
+		const SendMenu::Details &details) override;
 
 protected:
 	void visibleTopBottomUpdated(
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 20f32f6e8573c..90f11e9788d68 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -87,7 +87,7 @@ class FieldAutocomplete::Inner final : public Ui::RpWidget {
 		Api::SendOptions options = {}) const;
 
 	void setRecentInlineBotsInRows(int32 bots);
-	void setSendMenuType(Fn<SendMenu::Type()> &&callback);
+	void setSendMenuDetails(Fn<SendMenu::Details()> &&callback);
 	void rowsUpdated();
 
 	rpl::producer<FieldAutocomplete::MentionChosen> mentionChosen() const;
@@ -155,7 +155,7 @@ class FieldAutocomplete::Inner final : public Ui::RpWidget {
 	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
 	StickerPremiumMark _premiumMark;
 
-	Fn<SendMenu::Type()> _sendMenuType;
+	Fn<SendMenu::Details()> _sendMenuDetails;
 
 	rpl::event_stream<FieldAutocomplete::MentionChosen> _mentionChosen;
 	rpl::event_stream<FieldAutocomplete::HashtagChosen> _hashtagChosen;
@@ -835,8 +835,9 @@ bool FieldAutocomplete::chooseSelected(ChooseMethod method) const {
 	return _inner->chooseSelected(method);
 }
 
-void FieldAutocomplete::setSendMenuType(Fn<SendMenu::Type()> &&callback) {
-	_inner->setSendMenuType(std::move(callback));
+void FieldAutocomplete::setSendMenuDetails(
+		Fn<SendMenu::Details()> &&callback) {
+	_inner->setSendMenuDetails(std::move(callback));
 }
 
 bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) {
@@ -1364,24 +1365,22 @@ void FieldAutocomplete::Inner::contextMenuEvent(QContextMenuEvent *e) {
 		return;
 	}
 	const auto index = _sel;
-	const auto type = _sendMenuType
-		? _sendMenuType()
-		: SendMenu::Type::Disabled;
+	const auto details = _sendMenuDetails
+		? _sendMenuDetails()
+		: SendMenu::Details();
 	const auto method = FieldAutocomplete::ChooseMethod::ByClick;
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
 		st::popupMenuWithIcons);
 
-	const auto send = [=](Api::SendOptions options) {
+	const auto send = crl::guard(this, [=](Api::SendOptions options) {
 		chooseAtIndex(method, index, options);
-	};
+	});
 	SendMenu::FillSendMenu(
 		_menu,
-		type,
-		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(_show, type, send),
-		SendMenu::DefaultWhenOnlineCallback(send));
-
+		_show,
+		details,
+		SendMenu::DefaultCallback(_show, send));
 	if (!_menu->empty()) {
 		_menu->popup(QCursor::pos());
 	}
@@ -1604,9 +1603,9 @@ void FieldAutocomplete::Inner::showPreview() {
 	}
 }
 
-void FieldAutocomplete::Inner::setSendMenuType(
-		Fn<SendMenu::Type()> &&callback) {
-	_sendMenuType = std::move(callback);
+void FieldAutocomplete::Inner::setSendMenuDetails(
+		Fn<SendMenu::Details()> &&callback) {
+	_sendMenuDetails = std::move(callback);
 }
 
 auto FieldAutocomplete::Inner::mentionChosen() const
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
index 5c9e291f3a4a0..d95b7e394ee74 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
@@ -42,7 +42,7 @@ class DocumentMedia;
 } // namespace Data
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace ChatHelpers {
@@ -123,7 +123,7 @@ class FieldAutocomplete final : public Ui::RpWidget {
 	void setModerateKeyActivateCallback(Fn<bool(int)> callback) {
 		_moderateKeyActivateCallback = std::move(callback);
 	}
-	void setSendMenuType(Fn<SendMenu::Type()> &&callback);
+	void setSendMenuDetails(Fn<SendMenu::Details()> &&callback);
 
 	void hideFast();
 	void showAnimated();
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 609f21989d977..ab2fe0b98c342 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -380,22 +380,22 @@ void GifsListWidget::mousePressEvent(QMouseEvent *e) {
 }
 
 base::unique_qptr<Ui::PopupMenu> GifsListWidget::fillContextMenu(
-		SendMenu::Type type) {
+		const SendMenu::Details &details) {
 	if (_selected < 0 || _pressed >= 0) {
 		return nullptr;
 	}
 
 	auto menu = base::make_unique_q<Ui::PopupMenu>(this, st().menu);
-	const auto send = [=, selected = _selected](Api::SendOptions options) {
+	const auto selected = _selected;
+	const auto send = crl::guard(this, [=](Api::SendOptions options) {
 		selectInlineResult(selected, options, true);
-	};
+	});
 	const auto icons = &st().icons;
 	SendMenu::FillSendMenu(
 		menu,
-		type,
-		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(_show, type, send),
-		SendMenu::DefaultWhenOnlineCallback(send),
+		_show,
+		details,
+		SendMenu::DefaultCallback(_show, send),
 		icons);
 
 	if (const auto item = _mosaic.maybeItemAt(_selected)) {
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
index 84e20c86465fb..ad6c26ae659f7 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
@@ -40,7 +40,7 @@ class SessionController;
 } // namespace Window
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace Data {
@@ -102,7 +102,7 @@ class GifsListWidget final
 	rpl::producer<> cancelRequests() const;
 
 	base::unique_qptr<Ui::PopupMenu> fillContextMenu(
-		SendMenu::Type type) override;
+		const SendMenu::Details &details) override;
 
 	~GifsListWidget();
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index e44b8aaefee16..1425f6dd82b77 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -1634,7 +1634,7 @@ void StickersListWidget::showStickerSetBox(not_null<DocumentData*> document) {
 }
 
 base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
-		SendMenu::Type type) {
+		const SendMenu::Details &details) {
 	auto selected = _selected;
 	auto &sets = shownSets();
 	if (v::is_null(selected) || !v::is_null(_pressed)) {
@@ -1653,7 +1653,7 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 	auto menu = base::make_unique_q<Ui::PopupMenu>(this, st().menu);
 
 	const auto document = set.stickers[sticker->index].document;
-	const auto send = [=](Api::SendOptions options) {
+	const auto send = crl::guard(this, [=](Api::SendOptions options) {
 		_chosen.fire({
 			.document = document,
 			.options = options,
@@ -1661,14 +1661,13 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 				? Ui::MessageSendingAnimationFrom()
 				: messageSentAnimationInfo(section, index, document),
 		});
-	};
+	});
 	const auto icons = &st().icons;
 	SendMenu::FillSendMenu(
 		menu,
-		type,
-		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(_show, type, send),
-		SendMenu::DefaultWhenOnlineCallback(send),
+		_show,
+		details,
+		SendMenu::DefaultCallback(_show, send),
 		icons);
 
 	const auto show = _show;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index aff2cf287ef93..34838b3649cfb 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -116,7 +116,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	std::shared_ptr<Lottie::FrameRenderer> getLottieRenderer();
 
 	base::unique_qptr<Ui::PopupMenu> fillContextMenu(
-		SendMenu::Type type) override;
+		const SendMenu::Details &details) override;
 
 	bool mySetsEmpty() const;
 
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index b63ae69677bc1..5e8967541290e 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -1297,8 +1297,8 @@ void TabbedSelector::scrollToY(int y) {
 	}
 }
 
-void TabbedSelector::showMenuWithType(SendMenu::Type type) {
-	_menu = currentTab()->widget()->fillContextMenu(type);
+void TabbedSelector::showMenuWithDetails(SendMenu::Details details) {
+	_menu = currentTab()->widget()->fillContextMenu(details);
 	if (_menu && !_menu->empty()) {
 		_menu->popup(QCursor::pos());
 	}
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index b9b03b33b3313..bb780797ce577 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -36,7 +36,7 @@ class TabbedSearch;
 } // namespace Ui
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace style {
@@ -178,7 +178,7 @@ class TabbedSelector : public Ui::RpWidget {
 		_beforeHidingCallback = std::move(callback);
 	}
 
-	void showMenuWithType(SendMenu::Type type);
+	void showMenuWithDetails(SendMenu::Details details);
 	void setDropDown(bool dropDown);
 
 	// Float player interface.
@@ -380,7 +380,7 @@ class TabbedSelector::Inner : public Ui::RpWidget {
 	virtual void beforeHiding() {
 	}
 	[[nodiscard]] virtual base::unique_qptr<Ui::PopupMenu> fillContextMenu(
-			SendMenu::Type type) {
+			const SendMenu::Details &details) {
 		return nullptr;
 	}
 
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index a04cbcbfb52da..cdab73fb6fb6e 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -1297,9 +1297,10 @@ std::optional<Reaction> Reactions::parse(const MTPAvailableEffect &entry) {
 		return std::nullopt;
 	}
 	const auto id = DocumentId(data.vid().v);
-	const auto document = _owner->document(id);
+	const auto stickerId = data.veffect_sticker_id().v;
+	const auto document = _owner->document(stickerId);
 	if (!document->sticker()) {
-		LOG(("API Error: Bad sticker in effects: %1").arg(id));
+		LOG(("API Error: Bad sticker in effects: %1").arg(stickerId));
 		return std::nullopt;
 	}
 	const auto aroundId = data.veffect_animation_id().value_or_empty();
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index c89d3b0c78ebb..e769001801c92 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -321,14 +321,22 @@ HistoryWidget::HistoryWidget(
 	_fieldBarCancel->addClickHandler([=] { cancelFieldAreaState(); });
 	_send->addClickHandler([=] { sendButtonClicked(); });
 
-	SendMenu::SetupMenuAndShortcuts(
-		_send.get(),
-		controller->uiShow(),
-		[=] { return sendButtonMenuType(); },
-		[=] { sendSilent(); },
-		[=] { sendScheduled(); },
-		[=] { sendWhenOnline(); });
-
+	{
+		using namespace SendMenu;
+		const auto sendAction = [=](Action action, Details) {
+			const auto options = std::get_if<Api::SendOptions>(&action);
+			if (options || v::get<ActionType>(action) == ActionType::Send) {
+				send(options ? *options : Api::SendOptions());
+			} else {
+				sendScheduled();
+			}
+		};
+		SetupMenuAndShortcuts(
+			_send.get(),
+			controller->uiShow(),
+			[=] { return sendButtonMenuDetails(); },
+			sendAction);
+	}
 	_unblock->addClickHandler([=] { unblockUser(); });
 	_botStart->addClickHandler([=] { sendBotStartCommand(); });
 	_joinChannel->addClickHandler([=] { joinChannel(); });
@@ -514,7 +522,9 @@ HistoryWidget::HistoryWidget(
 		}
 	}, lifetime());
 
-	_fieldAutocomplete->setSendMenuType([=] { return sendMenuType(); });
+	_fieldAutocomplete->setSendMenuDetails([=] {
+		return sendMenuDetails();
+	});
 
 	if (_supportAutocomplete) {
 		supportInitAutocomplete();
@@ -1185,7 +1195,7 @@ void HistoryWidget::initTabbedSelector() {
 
 	selector->contextMenuRequested(
 	) | filter | rpl::start_with_next([=] {
-		selector->showMenuWithType(sendMenuType());
+		selector->showMenuWithDetails(sendMenuDetails());
 	}, lifetime());
 
 	selector->choosingStickerUpdated(
@@ -1564,7 +1574,9 @@ void HistoryWidget::applyInlineBotQuery(UserData *bot, const QString &query) {
 					sendInlineResult(result);
 				}
 			});
-			_inlineResults->setSendMenuType([=] { return sendMenuType(); });
+			_inlineResults->setSendMenuDetails([=] {
+				return sendMenuDetails();
+			});
 			_inlineResults->requesting(
 			) | rpl::start_with_next([=](bool requesting) {
 				_tabbedSelectorToggle->setLoading(requesting);
@@ -4177,10 +4189,6 @@ void HistoryWidget::sendWithModifiers(Qt::KeyboardModifiers modifiers) {
 	send({ .handleSupportSwitch = Support::HandleSwitch(modifiers) });
 }
 
-void HistoryWidget::sendSilent() {
-	send({ .silent = true });
-}
-
 void HistoryWidget::sendScheduled() {
 	if (!_list) {
 		return;
@@ -4196,22 +4204,20 @@ void HistoryWidget::sendScheduled() {
 		HistoryView::PrepareScheduleBox(
 			_list,
 			controller()->uiShow(),
-			sendMenuType(),
+			sendMenuDetails(),
 			callback));
 }
 
-void HistoryWidget::sendWhenOnline() {
-	send(Api::DefaultSendWhenOnlineOptions());
-}
-
-SendMenu::Type HistoryWidget::sendMenuType() const {
-	return !_peer
+SendMenu::Details HistoryWidget::sendMenuDetails() const {
+	const auto type = !_peer
 		? SendMenu::Type::Disabled
 		: _peer->isSelf()
 		? SendMenu::Type::Reminder
 		: HistoryView::CanScheduleUntilOnline(_peer)
 		? SendMenu::Type::ScheduledToUser
 		: SendMenu::Type::Scheduled;
+	const auto effectAllowed = _peer && _peer->isUser();
+	return { .type = type, .effectAllowed = effectAllowed };
 }
 
 auto HistoryWidget::computeSendButtonType() const {
@@ -4227,10 +4233,11 @@ auto HistoryWidget::computeSendButtonType() const {
 	return Type::Send;
 }
 
-SendMenu::Type HistoryWidget::sendButtonMenuType() const {
-	return (computeSendButtonType() == Ui::SendButton::Type::Send)
-		? sendMenuType()
-		: SendMenu::Type::Disabled;
+SendMenu::Details HistoryWidget::sendButtonMenuDetails() const {
+	if (computeSendButtonType() != Ui::SendButton::Type::Send) {
+		return {};
+	}
+	return sendMenuDetails();
 }
 
 void HistoryWidget::unblockUser() {
@@ -5609,7 +5616,7 @@ bool HistoryWidget::confirmSendingFiles(
 		text,
 		_peer,
 		Api::SendType::Normal,
-		sendMenuType());
+		sendMenuDetails());
 	_field->setTextWithTags({});
 	box->setConfirmedCallback(crl::guard(this, [=](
 			Ui::PreparedList &&list,
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index b731507b2ba80..ca2a9ed47315c 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -33,7 +33,7 @@ class PhotoMedia;
 } // namespace Data
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace Api {
@@ -268,7 +268,7 @@ class HistoryWidget final
 	void confirmDeleteSelected();
 	void clearSelected();
 
-	[[nodiscard]] SendMenu::Type sendMenuType() const;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
 	bool sendExistingDocument(
 		not_null<DocumentData*> document,
 		Api::SendOptions options,
@@ -395,10 +395,8 @@ class HistoryWidget final
 		Api::SendOptions options) const;
 	void send(Api::SendOptions options);
 	void sendWithModifiers(Qt::KeyboardModifiers modifiers);
-	void sendSilent();
 	void sendScheduled();
-	void sendWhenOnline();
-	[[nodiscard]] SendMenu::Type sendButtonMenuType() const;
+	[[nodiscard]] SendMenu::Details sendButtonMenuDetails() const;
 	void handlePendingHistoryUpdate();
 	void fullInfoUpdated();
 	void toggleTabbedSelectorMode();
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 7dcf2373bf95f..c81c59b8c3da7 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -854,7 +854,7 @@ ComposeControls::ComposeControls(
 		.recorderHeight = st::historySendSize.height(),
 		.lockFromBottom = descriptor.voiceLockFromBottom,
 	}))
-, _sendMenuType(descriptor.sendMenuType)
+, _sendMenuDetails(descriptor.sendMenuDetails)
 , _unavailableEmojiPasted(std::move(descriptor.unavailableEmojiPasted))
 , _saveDraftTimer([=] { saveDraft(); })
 , _saveCloudDraftTimer([=] { saveCloudDraft(); }) {
@@ -1719,7 +1719,7 @@ void ComposeControls::initAutocomplete() {
 		}
 	}, _autocomplete->lifetime());
 
-	_autocomplete->setSendMenuType([=] { return sendMenuType(); });
+	_autocomplete->setSendMenuDetails([=] { return sendMenuDetails(); });
 
 	//_autocomplete->setModerateKeyActivateCallback([=](int key) {
 	//	return _keyboard->isHidden()
@@ -2162,7 +2162,7 @@ void ComposeControls::initTabbedSelector() {
 
 	_selector->contextMenuRequested(
 	) | rpl::start_with_next([=] {
-		_selector->showMenuWithType(sendMenuType());
+		_selector->showMenuWithDetails(sendMenuDetails());
 	}, wrap->lifetime());
 
 	_selector->choosingStickerUpdated(
@@ -2191,17 +2191,15 @@ void ComposeControls::initSendButton() {
 		cancelInlineBot();
 	}, _send->lifetime());
 
-	const auto send = [=](Api::SendOptions options) {
+	const auto send = crl::guard(_send.get(), [=](Api::SendOptions options) {
 		_sendCustomRequests.fire(std::move(options));
-	};
+	});
 
 	SendMenu::SetupMenuAndShortcuts(
 		_send.get(),
 		_show,
-		[=] { return sendButtonMenuType(); },
-		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(_show, sendMenuType(), send),
-		SendMenu::DefaultWhenOnlineCallback(send));
+		[=] { return sendButtonMenuDetails(); },
+		SendMenu::DefaultCallback(_show, send));
 }
 
 void ComposeControls::initSendAsButton(not_null<PeerData*> peer) {
@@ -2510,14 +2508,14 @@ auto ComposeControls::computeSendButtonType() const {
 	return (_mode == Mode::Normal) ? Type::Send : Type::Schedule;
 }
 
-SendMenu::Type ComposeControls::sendMenuType() const {
-	return !_history ? SendMenu::Type::Disabled : _sendMenuType;
+SendMenu::Details ComposeControls::sendMenuDetails() const {
+	return !_history ? SendMenu::Details() : _sendMenuDetails();
 }
 
-SendMenu::Type ComposeControls::sendButtonMenuType() const {
+SendMenu::Details ComposeControls::sendButtonMenuDetails() const {
 	return (computeSendButtonType() == Ui::SendButton::Type::Send)
-		? sendMenuType()
-		: SendMenu::Type::Disabled;
+		? sendMenuDetails()
+		: SendMenu::Details();
 }
 
 void ComposeControls::updateSendButtonType() {
@@ -3325,7 +3323,9 @@ void ComposeControls::applyInlineBotQuery(
 					_inlineResultChosen.fire_copy(result);
 				}
 			});
-			_inlineResults->setSendMenuType([=] { return sendMenuType(); });
+			_inlineResults->setSendMenuDetails([=] {
+				return sendMenuDetails();
+			});
 			_inlineResults->requesting(
 			) | rpl::start_with_next([=](bool requesting) {
 				_tabbedSelectorToggle->setLoading(requesting);
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index f6c915968c08f..11e7429e234ca 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -29,7 +29,7 @@ struct ComposeControls;
 } // namespace style
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace ChatHelpers {
@@ -104,7 +104,7 @@ struct ComposeControlsDescriptor {
 	std::shared_ptr<ChatHelpers::Show> show;
 	Fn<void(not_null<DocumentData*>)> unavailableEmojiPasted;
 	ComposeControlsMode mode = ComposeControlsMode::Normal;
-	SendMenu::Type sendMenuType = {};
+	Fn<SendMenu::Details()> sendMenuDetails = nullptr;
 	Window::SessionController *regularWindow = nullptr;
 	rpl::producer<ChatHelpers::FileChosen> stickerOrEmojiChosen;
 	rpl::producer<QString> customPlaceholder;
@@ -282,8 +282,8 @@ class ComposeControls final {
 	void paintBackground(QPainter &p, QRect full, QRect clip);
 
 	[[nodiscard]] auto computeSendButtonType() const;
-	[[nodiscard]] SendMenu::Type sendMenuType() const;
-	[[nodiscard]] SendMenu::Type sendButtonMenuType() const;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
+	[[nodiscard]] SendMenu::Details sendButtonMenuDetails() const;
 
 	[[nodiscard]] auto sendContentRequests(
 		SendRequestType requestType = SendRequestType::Text) const;
@@ -396,7 +396,7 @@ class ComposeControls final {
 	const std::unique_ptr<FieldHeader> _header;
 	const std::unique_ptr<Controls::VoiceRecordBar> _voiceRecordBar;
 
-	const SendMenu::Type _sendMenuType;
+	const Fn<SendMenu::Details()> _sendMenuDetails;
 	const Fn<void(not_null<DocumentData*>)> _unavailableEmojiPasted;
 
 	rpl::event_stream<Api::SendOptions> _sendCustomRequests;
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 12e0b06c66566..781a4875d77cf 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -590,7 +590,7 @@ bool AddRescheduleAction(
 			HistoryView::PrepareScheduleBox(
 				&request.navigation->session(),
 				request.navigation->uiShow(),
-				sendMenuType,
+				{ .type = sendMenuType, .effectAllowed = false },
 				callback,
 				date));
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index b1dcb13dbc356..7f7ded51abd27 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -224,9 +224,11 @@ RepliesWidget::RepliesWidget(
 			listShowPremiumToast(emoji);
 		},
 		.mode = ComposeControls::Mode::Normal,
-		.sendMenuType = _topic
-			? SendMenu::Type::Scheduled
-			: SendMenu::Type::SilentOnly,
+		.sendMenuDetails = [=] {
+			using Type = SendMenu::Type;
+			const auto type = _topic ? Type::Scheduled : Type::SilentOnly;
+			return SendMenu::Details{ .type = type };
+		},
 		.regularWindow = controller,
 		.stickerOrEmojiChosen = controller->stickerOrEmojiChosen(),
 		.scheduledToggleValue = _topic
@@ -950,7 +952,7 @@ bool RepliesWidget::confirmSendingFiles(
 		_composeControls->getTextWithAppliedMarkdown(),
 		_history->peer,
 		Api::SendType::Normal,
-		SendMenu::Type::SilentOnly); // #TODO replies schedule
+		SendMenu::Details{ SendMenu::Type::SilentOnly }); // #TODO replies schedule
 
 	box->setConfirmedCallback(crl::guard(this, [=](
 			Ui::PreparedList &&list,
@@ -1445,13 +1447,14 @@ void RepliesWidget::sendInlineResult(
 	finishSending();
 }
 
-SendMenu::Type RepliesWidget::sendMenuType() const {
+SendMenu::Details RepliesWidget::sendMenuDetails() const {
 	// #TODO replies schedule
-	return _history->peer->isSelf()
+	const auto type = _history->peer->isSelf()
 		? SendMenu::Type::Reminder
 		: HistoryView::CanScheduleUntilOnline(_history->peer)
 		? SendMenu::Type::ScheduledToUser
 		: SendMenu::Type::Scheduled;
+	return { .type = type, .effectAllowed = _history->peer->isUser() };
 }
 
 FullReplyTo RepliesWidget::replyTo() const {
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index e3d05920e5f22..54f02ef169365 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -19,7 +19,7 @@ enum class SendMediaType;
 struct SendingAlbum;
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace Api {
@@ -249,7 +249,7 @@ class RepliesWidget final
 		mtpRequestId *const saveEditMsgRequestId,
 		std::optional<bool> spoilerMediaOverride);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
-	[[nodiscard]] SendMenu::Type sendMenuType() const;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
 	[[nodiscard]] FullReplyTo replyTo() const;
 	[[nodiscard]] HistoryItem *lookupRoot() const;
 	[[nodiscard]] Data::ForumTopic *lookupTopic();
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
index 83891717c6270..09288fed75dc1 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
@@ -70,7 +70,7 @@ bool CanScheduleUntilOnline(not_null<PeerData*> peer) {
 void ScheduleBox(
 		not_null<Ui::GenericBox*> box,
 		std::shared_ptr<ChatHelpers::Show> show,
-		SendMenu::Type type,
+		const SendMenu::Details &details,
 		Fn<void(Api::SendOptions)> done,
 		TimeId time,
 		ScheduleBoxStyleArgs style) {
@@ -87,7 +87,7 @@ void ScheduleBox(
 		copy(result);
 	};
 	auto descriptor = Ui::ChooseDateTimeBox(box, {
-		.title = (type == SendMenu::Type::Reminder
+		.title = (details.type == SendMenu::Type::Reminder
 			? tr::lng_remind_title()
 			: tr::lng_schedule_title()),
 		.submit = tr::lng_schedule_button(),
@@ -96,16 +96,26 @@ void ScheduleBox(
 		.style = style.chooseDateTimeArgs,
 	});
 
-	using T = SendMenu::Type;
-	SendMenu::SetupMenuAndShortcuts(
+	using namespace SendMenu;
+	const auto childType = (details.type == Type::Disabled)
+		? Type::Disabled
+		: Type::SilentOnly;
+	const auto childDetails = Details{
+		.type = childType,
+		.effectAllowed = details.effectAllowed,
+	};
+	const auto sendAction = crl::guard(box, [=](Action action, Details) {
+		save(
+			v::get<Api::SendOptions>(action).silent,
+			descriptor.collect());
+	});
+	SetupMenuAndShortcuts(
 		descriptor.submit.data(),
 		show,
-		[t = type == T::Disabled ? T::Disabled : T::SilentOnly] { return t; },
-		[=] { save(true, descriptor.collect()); },
-		nullptr,
-		nullptr);
+		[=] { return childDetails; },
+		sendAction);
 
-	if (type == SendMenu::Type::ScheduledToUser) {
+	if (details.type == Type::ScheduledToUser) {
 		const auto sendUntilOnline = box->addTopButton(*style.topButtonStyle);
 		const auto timestamp = Api::kScheduledUntilOnlineTimestamp;
 		FillSendUntilOnlineMenu(
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.h b/Telegram/SourceFiles/history/view/history_view_schedule_box.h
index 72c2b4b892a1d..a6917710247a5 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.h
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.h
@@ -23,7 +23,7 @@ class Show;
 } // namespace ChatHelpers
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace HistoryView {
@@ -41,7 +41,7 @@ struct ScheduleBoxStyleArgs {
 void ScheduleBox(
 	not_null<Ui::GenericBox*> box,
 	std::shared_ptr<ChatHelpers::Show> show,
-	SendMenu::Type type,
+	const SendMenu::Details &details,
 	Fn<void(Api::SendOptions)> done,
 	TimeId time,
 	ScheduleBoxStyleArgs style);
@@ -50,14 +50,14 @@ template <typename Guard, typename Submit>
 [[nodiscard]] object_ptr<Ui::GenericBox> PrepareScheduleBox(
 		Guard &&guard,
 		std::shared_ptr<ChatHelpers::Show> show,
-		SendMenu::Type type,
+		const SendMenu::Details &details,
 		Submit &&submit,
 		TimeId scheduleTime = DefaultScheduleTime(),
 		ScheduleBoxStyleArgs style = ScheduleBoxStyleArgs()) {
 	return Box(
 		ScheduleBox,
 		std::move(show),
-		type,
+		details,
 		crl::guard(std::forward<Guard>(guard), std::forward<Submit>(submit)),
 		scheduleTime,
 		std::move(style));
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index e0522acb0bf4f..6535958beab0c 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -115,7 +115,7 @@ ScheduledWidget::ScheduledWidget(
 			listShowPremiumToast(emoji);
 		},
 		.mode = ComposeControls::Mode::Scheduled,
-		.sendMenuType = SendMenu::Type::Disabled,
+		.sendMenuDetails = [] { return SendMenu::Details(); },
 		.regularWindow = controller,
 		.stickerOrEmojiChosen = controller->stickerOrEmojiChosen(),
 	}))
@@ -493,7 +493,7 @@ bool ScheduledWidget::confirmSendingFiles(
 		(CanScheduleUntilOnline(_history->peer)
 			? Api::SendType::ScheduledToUser
 			: Api::SendType::Scheduled),
-		SendMenu::Type::Disabled);
+		SendMenu::Details());
 
 	box->setConfirmedCallback(crl::guard(this, [=](
 			Ui::PreparedList &&list,
@@ -602,7 +602,7 @@ void ScheduledWidget::uploadFile(
 			prepareSendAction(options));
 	};
 	controller()->show(
-		PrepareScheduleBox(this, _show, sendMenuType(), callback));
+		PrepareScheduleBox(this, _show, sendMenuDetails(), callback));
 }
 
 bool ScheduledWidget::showSendingFilesError(
@@ -681,7 +681,7 @@ void ScheduledWidget::send() {
 	}
 	const auto callback = [=](Api::SendOptions options) { send(options); };
 	controller()->show(
-		PrepareScheduleBox(this, _show, sendMenuType(), callback));
+		PrepareScheduleBox(this, _show, sendMenuDetails(), callback));
 }
 
 void ScheduledWidget::send(Api::SendOptions options) {
@@ -713,7 +713,7 @@ void ScheduledWidget::sendVoice(
 		sendVoice(bytes, waveform, duration, options);
 	};
 	controller()->show(
-		PrepareScheduleBox(this, _show, sendMenuType(), callback));
+		PrepareScheduleBox(this, _show, sendMenuDetails(), callback));
 }
 
 void ScheduledWidget::sendVoice(
@@ -814,7 +814,7 @@ void ScheduledWidget::sendExistingDocument(
 		sendExistingDocument(document, options);
 	};
 	controller()->show(
-		PrepareScheduleBox(this, _show, sendMenuType(), callback));
+		PrepareScheduleBox(this, _show, sendMenuDetails(), callback));
 }
 
 bool ScheduledWidget::sendExistingDocument(
@@ -844,7 +844,7 @@ void ScheduledWidget::sendExistingPhoto(not_null<PhotoData*> photo) {
 		sendExistingPhoto(photo, options);
 	};
 	controller()->show(
-		PrepareScheduleBox(this, _show, sendMenuType(), callback));
+		PrepareScheduleBox(this, _show, sendMenuDetails(), callback));
 }
 
 bool ScheduledWidget::sendExistingPhoto(
@@ -879,7 +879,7 @@ void ScheduledWidget::sendInlineResult(
 		sendInlineResult(result, bot, options);
 	};
 	controller()->show(
-		PrepareScheduleBox(this, _show, sendMenuType(), callback));
+		PrepareScheduleBox(this, _show, sendMenuDetails(), callback));
 }
 
 void ScheduledWidget::sendInlineResult(
@@ -911,12 +911,14 @@ void ScheduledWidget::sendInlineResult(
 	_composeControls->focus();
 }
 
-SendMenu::Type ScheduledWidget::sendMenuType() const {
-	return _history->peer->isSelf()
+SendMenu::Details ScheduledWidget::sendMenuDetails() const {
+	const auto type = _history->peer->isSelf()
 		? SendMenu::Type::Reminder
 		: HistoryView::CanScheduleUntilOnline(_history->peer)
 		? SendMenu::Type::ScheduledToUser
 		: SendMenu::Type::Scheduled;
+	const auto effectAllowed = _history->peer->isUser();
+	return { .type = type, .effectAllowed = effectAllowed };
 }
 
 void ScheduledWidget::cornerButtonsShowAtPosition(
@@ -1368,7 +1370,7 @@ void ScheduledWidget::listSendBotCommand(
 		session().api().sendMessage(std::move(message));
 	};
 	controller()->show(
-		PrepareScheduleBox(this, _show, sendMenuType(), callback));
+		PrepareScheduleBox(this, _show, sendMenuDetails(), callback));
 }
 
 void ScheduledWidget::listSearch(
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index cb5ead98f06d1..e79304691915b 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -22,7 +22,7 @@ class Show;
 } // namespace ChatHelpers
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace Api {
@@ -221,7 +221,7 @@ class ScheduledWidget final
 		std::optional<bool> spoilerMediaOverride);
 	void highlightSingleNewMessage(const Data::MessagesSlice &slice);
 	void chooseAttach();
-	[[nodiscard]] SendMenu::Type sendMenuType() const;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
 
 	void pushReplyReturn(not_null<HistoryItem*> item);
 	void checkReplyReturns();
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index 61c46a1578ff9..9ab46ef1409c3 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -23,6 +23,7 @@ For license and copyright information please follow this link:
 #include "data/stickers/data_custom_emoji.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "menu/menu_send.h"
 #include "chat_helpers/emoji_list_widget.h"
 #include "chat_helpers/stickers_list_footer.h"
 #include "window/window_session_controller.h"
@@ -123,15 +124,11 @@ UnifiedFactoryOwner::UnifiedFactoryOwner(
 	const auto inStrip = _strip ? _strip->count() : 0;
 	_unifiedIdsList.reserve(reactions.size());
 	for (const auto &reaction : reactions) {
-		if (const auto id = reaction.id.custom()) {
-			_unifiedIdsList.push_back(id);
-		} else {
-			_unifiedIdsList.push_back(reaction.selectAnimation->id);
-		}
+		_unifiedIdsList.push_back(reaction.selectAnimation->id);
 
 		const auto unifiedId = _unifiedIdsList.back();
-		if (!reaction.id.custom()) {
-			_defaultReactionIds.emplace(unifiedId, reaction.id.emoji());
+		if (unifiedId != reaction.id.custom()) {
+			_defaultReactionIds.emplace(unifiedId, reaction.id);
 		}
 		if (index + 1 < inStrip) {
 			_defaultReactionInStripMap.emplace(unifiedId, index++);
@@ -165,7 +162,7 @@ Data::ReactionId UnifiedFactoryOwner::lookupReactionId(
 		DocumentId unifiedId) const {
 	const auto i = _defaultReactionIds.find(unifiedId);
 	return (i != end(_defaultReactionIds))
-		? Data::ReactionId{ i->second }
+		? i->second
 		: Data::ReactionId{ unifiedId };
 }
 
@@ -174,21 +171,23 @@ UnifiedFactoryOwner::RecentFactory UnifiedFactoryOwner::factory() {
 	-> std::unique_ptr<Ui::Text::CustomEmoji> {
 		const auto tag = Data::CustomEmojiManager::SizeTag::Large;
 		const auto sizeOverride = st::reactStripImage;
-		const auto isDefaultReaction = _defaultReactionIds.contains(id);
+		const auto i = _defaultReactionIds.find(id);
+		const auto isDefaultReaction = (i != end(_defaultReactionIds))
+			&& !i->second.custom();
 		const auto manager = &_session->data().customEmojiManager();
 		auto result = isDefaultReaction
 			? std::make_unique<Ui::Text::ShiftedEmoji>(
 				manager->create(id, std::move(repaint), tag, sizeOverride),
 				_defaultReactionShift)
 			: manager->create(id, std::move(repaint), tag);
-		const auto i = _defaultReactionInStripMap.find(id);
-		if (i != end(_defaultReactionInStripMap)) {
+		const auto j = _defaultReactionInStripMap.find(id);
+		if (j != end(_defaultReactionInStripMap)) {
 			Assert(_strip != nullptr);
 			return std::make_unique<StripEmoji>(
 				std::move(result),
 				_strip,
 				-_stripPaintOneShift,
-				i->second);
+				j->second);
 		}
 		return result;
 	};
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
index cb9b8a68f4226..06de4e7cd3111 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -66,7 +66,7 @@ class UnifiedFactoryOwner final {
 	Strip *_strip = nullptr;
 
 	std::vector<DocumentId> _unifiedIdsList;
-	base::flat_map<DocumentId, QString> _defaultReactionIds;
+	base::flat_map<DocumentId, Data::ReactionId> _defaultReactionIds;
 	base::flat_map<DocumentId, int> _defaultReactionInStripMap;
 
 	QPoint _defaultReactionShift;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
index 3a3176908c566..02f6f986ebe54 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
@@ -229,7 +229,7 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 
 	_panel->selector()->contextMenuRequested(
 	) | rpl::start_with_next([=] {
-		_panel->selector()->showMenuWithType(SendMenu::Type::Scheduled);
+		_panel->selector()->showMenuWithDetails({});
 	}, _panel->lifetime());
 
 	auto statusChosen = _panel->selector()->customEmojiChosen(
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 95e7630e4cfc5..1eb99362bba47 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -1703,7 +1703,7 @@ std::unique_ptr<Ui::DropdownMenu> MakeAttachBotsMenu(
 				flag,
 				flag,
 				source,
-				sendMenuType);
+				{ sendMenuType });
 		}, &st::menuIconCreatePoll);
 	}
 	for (const auto &bot : bots->attachBots()) {
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
index 5e45b3d4a0af4..74219011dc74b 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -329,23 +329,23 @@ void Inner::contextMenuEvent(QContextMenuEvent *e) {
 	if (_selected < 0 || _pressed >= 0) {
 		return;
 	}
-	const auto type = _sendMenuType
-		? _sendMenuType()
-		: SendMenu::Type::Disabled;
+	const auto details = _sendMenuDetails
+		? _sendMenuDetails()
+		: SendMenu::Details();
 
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
 		st::popupMenuWithIcons);
 
-	const auto send = [=, selected = _selected](Api::SendOptions options) {
+	const auto selected = _selected;
+	const auto send = crl::guard(this, [=](Api::SendOptions options) {
 		selectInlineResult(selected, options, false);
-	};
+	});
 	SendMenu::FillSendMenu(
 		_menu,
-		type,
-		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(_controller->uiShow(), type, send),
-		SendMenu::DefaultWhenOnlineCallback(send));
+		_controller->uiShow(),
+		details,
+		SendMenu::DefaultCallback(_controller->uiShow(), send));
 
 	const auto item = _mosaic.itemAt(_selected);
 	if (const auto previewDocument = item->getPreviewDocument()) {
@@ -689,8 +689,8 @@ void Inner::switchPm() {
 	}
 }
 
-void Inner::setSendMenuType(Fn<SendMenu::Type()> &&callback) {
-	_sendMenuType = std::move(callback);
+void Inner::setSendMenuDetails(Fn<SendMenu::Details()> &&callback) {
+	_sendMenuDetails = std::move(callback);
 }
 
 } // namespace Layout
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.h b/Telegram/SourceFiles/inline_bots/inline_results_inner.h
index 5aa22578a2d5e..4e6195e19749a 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.h
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.h
@@ -43,7 +43,7 @@ struct ResultSelected;
 } // namespace InlineBots
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace InlineBots {
@@ -89,7 +89,7 @@ class Inner
 	void setResultSelectedCallback(Fn<void(ResultSelected)> callback) {
 		_resultSelectedCallback = std::move(callback);
 	}
-	void setSendMenuType(Fn<SendMenu::Type()> &&callback);
+	void setSendMenuDetails(Fn<SendMenu::Details()> &&callback);
 
 	// Ui::AbstractTooltipShower interface.
 	QString tooltipText() const override;
@@ -179,7 +179,7 @@ class Inner
 	bool _previewShown = false;
 
 	Fn<void(ResultSelected)> _resultSelectedCallback;
-	Fn<SendMenu::Type()> _sendMenuType;
+	Fn<SendMenu::Details()> _sendMenuDetails;
 
 };
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index c6e4b3380f640..12dfbb5f910ce 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -265,8 +265,8 @@ void Widget::setResultSelectedCallback(Fn<void(ResultSelected)> callback) {
 	_inner->setResultSelectedCallback(std::move(callback));
 }
 
-void Widget::setSendMenuType(Fn<SendMenu::Type()> &&callback) {
-	_inner->setSendMenuType(std::move(callback));
+void Widget::setSendMenuDetails(Fn<SendMenu::Details()> &&callback) {
+	_inner->setSendMenuDetails(std::move(callback));
 }
 
 void Widget::hideAnimated() {
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.h b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
index 00b39e0d3838d..166287c583be7 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.h
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
@@ -45,7 +45,7 @@ struct ResultSelected;
 } // namespace InlineBots
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace InlineBots {
@@ -75,7 +75,7 @@ class Widget : public Ui::RpWidget {
 	void hideAnimated();
 
 	void setResultSelectedCallback(Fn<void(ResultSelected)> callback);
-	void setSendMenuType(Fn<SendMenu::Type()> &&callback);
+	void setSendMenuDetails(Fn<SendMenu::Details()> &&callback);
 
 	[[nodiscard]] rpl::producer<bool> requesting() const {
 		return _requesting.events();
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 4dd47970dfe5b..5f94f8a22fefa 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1047,8 +1047,8 @@ void MainWidget::exportTopBarHeightUpdated() {
 	}
 }
 
-SendMenu::Type MainWidget::sendMenuType() const {
-	return _history->sendMenuType();
+SendMenu::Details MainWidget::sendMenuDetails() const {
+	return _history->sendMenuDetails();
 }
 
 bool MainWidget::sendExistingDocument(not_null<DocumentData*> document) {
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 14e1ef2abe1f2..3653070acb7e9 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -29,7 +29,7 @@ struct SendOptions;
 } // namespace Api
 
 namespace SendMenu {
-enum class Type;
+struct Details;
 } // namespace SendMenu
 
 namespace Main {
@@ -157,7 +157,7 @@ class MainWidget final
 	QPixmap grabForShowAnimation(const Window::SectionSlideParams &params);
 	void checkMainSectionToLayer();
 
-	[[nodiscard]] SendMenu::Type sendMenuType() const;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
 	bool sendExistingDocument(not_null<DocumentData*> document);
 	bool sendExistingDocument(
 		not_null<DocumentData*> document,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index b1a33d9c155f6..d93f49bf1ec4c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -123,7 +123,7 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 			showPremiumToast(emoji);
 		},
 		.mode = HistoryView::ComposeControlsMode::Normal,
-		.sendMenuType = SendMenu::Type::SilentOnly,
+		.sendMenuDetails = sendMenuDetails(),
 		.stickerOrEmojiChosen = _controller->stickerOrEmojiChosen(),
 		.customPlaceholder = PlaceholderText(
 			_controller->uiShow(),
@@ -473,6 +473,15 @@ void ReplyArea::chooseAttach(
 		crl::guard(this, [=] { _choosingAttach = false; }));
 }
 
+Fn<SendMenu::Details()> ReplyArea::sendMenuDetails() const {
+	return crl::guard(this, [=] {
+		return SendMenu::Details{
+			.type = SendMenu::Type::SilentOnly,
+			.effectAllowed = _data.peer && _data.peer->isUser(),
+		};
+	});
+}
+
 bool ReplyArea::confirmSendingFiles(
 		not_null<const QMimeData*> data,
 		std::optional<bool> overrideSendImagesAsPhotos,
@@ -528,7 +537,7 @@ bool ReplyArea::confirmSendingFiles(
 		.limits = DefaultLimitsForPeer(_data.peer),
 		.check = DefaultCheckForPeer(show, _data.peer),
 		.sendType = Api::SendType::Normal,
-		.sendMenuType = SendMenu::Type::SilentOnly,
+		.sendMenuDetails = sendMenuDetails(),
 		.stOverride = &st::storiesComposeControls,
 		.confirmed = crl::guard(this, confirmed),
 		.cancelled = _controls->restoreTextCallback(insertTextOnCancel),
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index 90214b421cc75..3e4ff217bfd05 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -38,6 +38,10 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace SendMenu {
+struct Details;
+} // namespace SendMenu
+
 namespace Ui {
 struct PreparedList;
 class SendFilesWay;
@@ -141,6 +145,8 @@ class ReplyArea final : public base::has_weak_ptr {
 	void sendVoice(VoiceToSend &&data);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
 
+	[[nodiscard]] Fn<SendMenu::Details()> sendMenuDetails() const;
+
 	void showPremiumToast(not_null<DocumentData*> emoji);
 	[[nodiscard]] bool showSlowmodeError();
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 94dede7e90943..836887e8cd62e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -348,8 +348,8 @@ class OverlayWidget::Show final : public ChatHelpers::Show {
 	rpl::producer<bool> adjustShadowLeft() const override {
 		return rpl::single(false);
 	}
-	SendMenu::Type sendMenuType() const override {
-		return SendMenu::Type::SilentOnly;
+	SendMenu::Details sendMenuDetails() const override {
+		return { SendMenu::Type::SilentOnly };
 	}
 
 	bool showMediaPreview(
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 1a1b09757dcb9..1f216122beb32 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -37,140 +37,121 @@ namespace {
 		not_null<Main::Session*> session) {
 	auto result = Data::PossibleItemReactionsRef();
 	const auto reactions = &session->data().reactions();
-	const auto &full = reactions->list(Data::Reactions::Type::Active);
-	const auto &top = reactions->list(Data::Reactions::Type::Top);
-	const auto &recent = reactions->list(Data::Reactions::Type::Recent);
+	const auto &effects = reactions->list(Data::Reactions::Type::Effects);
 	const auto premiumPossible = session->premiumPossible();
 	auto added = base::flat_set<Data::ReactionId>();
-	result.recent.reserve(full.size());
-	for (const auto &reaction : ranges::views::concat(top, recent, full)) {
-		if (premiumPossible || !reaction.id.custom()) {
+	result.recent.reserve(effects.size());
+	for (const auto &reaction : effects) {
+		if (premiumPossible || !reaction.premium) {
 			if (added.emplace(reaction.id).second) {
 				result.recent.push_back(&reaction);
 			}
 		}
 	}
-	result.customAllowed = premiumPossible;
-	const auto i = ranges::find(
-		result.recent,
-		reactions->favoriteId(),
-		&Data::Reaction::id);
-	if (i != end(result.recent) && i != begin(result.recent)) {
-		std::rotate(begin(result.recent), i, i + 1);
-	}
 	return result;
 }
 
 } // namespace
 
-Fn<void()> DefaultSilentCallback(Fn<void(Api::SendOptions)> send) {
-	return [=] { send({ .silent = true }); };
-}
-
-Fn<void()> DefaultScheduleCallback(
+Fn<void(Action, Details)> DefaultCallback(
 		std::shared_ptr<ChatHelpers::Show> show,
-		Type type,
 		Fn<void(Api::SendOptions)> send) {
-	return [=, weak = Ui::MakeWeak(show->toastParent())] {
-		show->showBox(
-			HistoryView::PrepareScheduleBox(
-				weak,
-				show,
-				type,
-				[=](Api::SendOptions options) { send(options); }),
-			Ui::LayerOption::KeepOther);
+	const auto guard = Ui::MakeWeak(show->toastParent());
+	return [=](Action action, Details details) {
+		if (const auto options = std::get_if<Api::SendOptions>(&action)) {
+			send(*options);
+		} else if (v::get<ActionType>(action) == ActionType::Send) {
+			send({});
+		} else {
+			using namespace HistoryView;
+			auto box = PrepareScheduleBox(guard, show, details, send);
+			const auto weak = Ui::MakeWeak(box.data());
+			show->showBox(std::move(box));
+			if (const auto strong = weak.data()) {
+				strong->setCloseByOutsideClick(false);
+			}
+		}
 	};
 }
 
-Fn<void()> DefaultWhenOnlineCallback(Fn<void(Api::SendOptions)> send) {
-	return [=] { send(Api::DefaultSendWhenOnlineOptions()); };
-}
-
 FillMenuResult FillSendMenu(
 		not_null<Ui::PopupMenu*> menu,
-		Type type,
-		Fn<void()> silent,
-		Fn<void()> schedule,
-		Fn<void()> whenOnline,
-		const style::ComposeIcons *iconsOverride) {
-	if (!silent && !schedule) {
-		return FillMenuResult::None;
+		std::shared_ptr<ChatHelpers::Show> showForEffect,
+		Details details,
+		Fn<void(Action, Details)> action,
+		const style::ComposeIcons *iconsOverride,
+		std::optional<QPoint> desiredPositionOverride) {
+	const auto type = details.type;
+	if (type == Type::Disabled || !action) {
+		return FillMenuResult::Skipped;
 	}
 	const auto &icons = iconsOverride
 		? *iconsOverride
 		: st::defaultComposeIcons;
-	const auto now = type;
-	if (now == Type::Disabled
-		|| (!silent && now == Type::SilentOnly)) {
-		return FillMenuResult::None;
-	}
 
-	if (silent && now != Type::Reminder) {
+	if (type != Type::Reminder) {
 		menu->addAction(
 			tr::lng_send_silent_message(tr::now),
-			silent,
+			[=] { action(Api::SendOptions{ .silent = true }, details); },
 			&icons.menuMute);
 	}
-	if (schedule && now != Type::SilentOnly) {
+	if (type != Type::SilentOnly) {
 		menu->addAction(
-			(now == Type::Reminder
+			(type == Type::Reminder
 				? tr::lng_reminder_message(tr::now)
 				: tr::lng_schedule_message(tr::now)),
-			schedule,
+			[=] { action(ActionType::Schedule, details); },
 			&icons.menuSchedule);
 	}
-	if (whenOnline && now == Type::ScheduledToUser) {
+	if (type == Type::ScheduledToUser) {
 		menu->addAction(
 			tr::lng_scheduled_send_until_online(tr::now),
-			whenOnline,
+			[=] { action(Api::DefaultSendWhenOnlineOptions(), details); },
 			&icons.menuWhenOnline);
 	}
-	return FillMenuResult::Success;
+
+	using namespace HistoryView::Reactions;
+	const auto position = desiredPositionOverride.value_or(QCursor::pos());
+	const auto selector = (showForEffect && details.effectAllowed)
+		? AttachSelectorToMenu(
+			menu,
+			position,
+			st::reactPanelEmojiPan,
+			showForEffect,
+			LookupPossibleEffects(&showForEffect->session()),
+			{ tr::lng_effect_add_title(tr::now) })
+		: base::make_unexpected(AttachSelectorResult::Skipped);
+	if (!selector) {
+		if (selector.error() == AttachSelectorResult::Failed) {
+			return FillMenuResult::Failed;
+		}
+		menu->prepareGeometryFor(position);
+		return FillMenuResult::Prepared;
+	}
+
+	(*selector)->chosen(
+	) | rpl::start_with_next([=](ChosenReaction chosen) {
+
+	}, menu->lifetime());
+
+	return FillMenuResult::Prepared;
 }
 
 void SetupMenuAndShortcuts(
 		not_null<Ui::RpWidget*> button,
 		std::shared_ptr<ChatHelpers::Show> show,
-		Fn<Type()> type,
-		Fn<void()> silent,
-		Fn<void()> schedule,
-		Fn<void()> whenOnline) {
-	if (!silent && !schedule && !whenOnline) {
-		return;
-	}
+		Fn<Details()> details,
+		Fn<void(Action, Details)> action) {
 	const auto menu = std::make_shared<base::unique_qptr<Ui::PopupMenu>>();
 	const auto showMenu = [=] {
 		*menu = base::make_unique_q<Ui::PopupMenu>(
 			button,
 			st::popupMenuWithIcons);
-		const auto result = FillSendMenu(
-			*menu,
-			type(),
-			silent,
-			schedule,
-			whenOnline);
-		if (result != FillMenuResult::Success) {
-			return false;
-		}
-		const auto desiredPosition = QCursor::pos();
-		using namespace HistoryView::Reactions;
-		const auto selector = show
-			? AttachSelectorToMenu(
-				menu->get(),
-				desiredPosition,
-				st::reactPanelEmojiPan,
-				show,
-				LookupPossibleEffects(&show->session()),
-				{ tr::lng_effect_add_title(tr::now) })
-			: base::make_unexpected(AttachSelectorResult::Skipped);
-		if (selector) {
-			//(*selector)->chosen();
-			(*menu)->popupPrepared();
-		} else if (selector.error() == AttachSelectorResult::Failed) {
+		const auto result = FillSendMenu(*menu, show, details(), action);
+		if (result != FillMenuResult::Prepared) {
 			return false;
-		} else {
-			(*menu)->popup(desiredPosition);
 		}
+		(*menu)->popupPrepared();
 		return true;
 	};
 	base::install_event_filter(button, [=](not_null<QEvent*> e) {
@@ -186,24 +167,21 @@ void SetupMenuAndShortcuts(
 	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
-		const auto now = type();
-		if (now == Type::Disabled
-			|| (!silent && now == Type::SilentOnly)) {
+		const auto now = details().type;
+		if (now == Type::Disabled) {
 			return;
 		}
-		(silent
-			&& (now != Type::Reminder)
+		((now != Type::Reminder)
 			&& request->check(Command::SendSilentMessage)
 			&& request->handle([=] {
-				silent();
+				action(Api::SendOptions{ .silent = true }, details());
 				return true;
 			}))
 		||
-		(schedule
-			&& (now != Type::SilentOnly)
+		((now != Type::SilentOnly)
 			&& request->check(Command::ScheduleMessage)
 			&& request->handle([=] {
-				schedule();
+				action(ActionType::Schedule, details());
 				return true;
 			}))
 		||
diff --git a/Telegram/SourceFiles/menu/menu_send.h b/Telegram/SourceFiles/menu/menu_send.h
index 250ac1e773cc2..66004c17964a1 100644
--- a/Telegram/SourceFiles/menu/menu_send.h
+++ b/Telegram/SourceFiles/menu/menu_send.h
@@ -39,33 +39,39 @@ enum class Type {
 	Reminder,
 };
 
+struct Details {
+	Type type = Type::Disabled;
+	bool effectAllowed = false;
+};
+
 enum class FillMenuResult {
-	Success,
-	None,
+	Prepared,
+	Skipped,
+	Failed,
 };
 
-Fn<void()> DefaultSilentCallback(Fn<void(Api::SendOptions)> send);
-Fn<void()> DefaultScheduleCallback(
+enum class ActionType {
+	Send,
+	Schedule,
+};
+using Action = std::variant<Api::SendOptions, ActionType>;
+[[nodiscard]] Fn<void(Action, Details)> DefaultCallback(
 	std::shared_ptr<ChatHelpers::Show> show,
-	Type type,
 	Fn<void(Api::SendOptions)> send);
-Fn<void()> DefaultWhenOnlineCallback(Fn<void(Api::SendOptions)> send);
 
 FillMenuResult FillSendMenu(
 	not_null<Ui::PopupMenu*> menu,
-	Type type,
-	Fn<void()> silent,
-	Fn<void()> schedule,
-	Fn<void()> whenOnline,
-	const style::ComposeIcons *iconsOverride = nullptr);
+	std::shared_ptr<ChatHelpers::Show> showForEffect,
+	Details details,
+	Fn<void(Action, Details)> action,
+	const style::ComposeIcons *iconsOverride = nullptr,
+	std::optional<QPoint> desiredPositionOverride = std::nullopt);
 
 void SetupMenuAndShortcuts(
 	not_null<Ui::RpWidget*> button,
 	std::shared_ptr<ChatHelpers::Show> show,
-	Fn<Type()> type,
-	Fn<void()> silent,
-	Fn<void()> schedule,
-	Fn<void()> whenOnline);
+	Fn<Details()> details,
+	Fn<void(Action, Details)> action);
 
 void SetupUnreadMentionsMenu(
 	not_null<Ui::RpWidget*> button,
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index 22e419efa6c75..ccbb1aea2b914 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -242,7 +242,6 @@ class ShortcutMessages
 		mtpRequestId *const saveEditMsgRequestId,
 		std::optional<bool> spoilerMediaOverride);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
-	[[nodiscard]] SendMenu::Type sendMenuType() const;
 	[[nodiscard]] FullReplyTo replyTo() const;
 	void doSetInnerFocus();
 	void showAtPosition(
@@ -792,7 +791,7 @@ QPointer<Ui::RpWidget> ShortcutMessages::createPinnedToBottom(
 				listShowPremiumToast(emoji);
 			},
 			.mode = HistoryView::ComposeControlsMode::Normal,
-			.sendMenuType = SendMenu::Type::Disabled,
+			.sendMenuDetails = [] { return SendMenu::Details(); },
 			.regularWindow = _controller,
 			.stickerOrEmojiChosen = _controller->stickerOrEmojiChosen(),
 			.customPlaceholder = std::move(placeholder),
@@ -1346,7 +1345,7 @@ bool ShortcutMessages::confirmSendingFiles(
 		_composeControls->getTextWithAppliedMarkdown(),
 		_history->peer,
 		Api::SendType::Normal,
-		SendMenu::Type::Disabled);
+		SendMenu::Details());
 
 	box->setConfirmedCallback(crl::guard(this, [=](
 			Ui::PreparedList &&list,
@@ -1543,12 +1542,6 @@ void ShortcutMessages::sendInlineResult(
 		return;
 	}
 	sendInlineResult(result, bot, {}, std::nullopt);
-	//const auto callback = [=](Api::SendOptions options) {
-	//	sendInlineResult(result, bot, options);
-	//};
-	//Ui::show(
-	//	PrepareScheduleBox(this, sendMenuType(), callback),
-	//	Ui::LayerOption::KeepOther);
 }
 
 void ShortcutMessages::sendInlineResult(
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index a4d57f791d2d8..cea2896683a7d 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1141,7 +1141,7 @@ void Filler::addCreatePoll() {
 			flag,
 			flag,
 			source,
-			sendMenuType);
+			{ sendMenuType });
 	};
 	_addAction(
 		tr::lng_polls_create(tr::now),
@@ -1589,7 +1589,7 @@ void PeerMenuCreatePoll(
 		PollData::Flags chosen,
 		PollData::Flags disabled,
 		Api::SendType sendType,
-		SendMenu::Type sendMenuType) {
+		SendMenu::Details sendMenuDetails) {
 	if (peer->isChannel() && !peer->isMegagroup()) {
 		chosen &= ~PollData::Flag::PublicVotes;
 		disabled |= PollData::Flag::PublicVotes;
@@ -1599,7 +1599,7 @@ void PeerMenuCreatePoll(
 		chosen,
 		disabled,
 		sendType,
-		sendMenuType);
+		sendMenuDetails);
 	const auto weak = Ui::MakeWeak(box.data());
 	const auto lock = box->lifetime().make_state<bool>(false);
 	box->submitRequests(
@@ -2071,17 +2071,14 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 
 			state->menu->addSeparator();
 		}
-		const auto type = sendMenuType();
+		state->menu->setForcedVerticalOrigin(
+			Ui::PopupMenu::VerticalOrigin::Bottom);
 		const auto result = SendMenu::FillSendMenu(
 			state->menu.get(),
-			type,
-			SendMenu::DefaultSilentCallback(submit),
-			SendMenu::DefaultScheduleCallback(show, type, submit),
-			SendMenu::DefaultWhenOnlineCallback(submit));
-		const auto success = (result == SendMenu::FillMenuResult::Success);
-		if (showForwardOptions || success) {
-			state->menu->setForcedVerticalOrigin(
-				Ui::PopupMenu::VerticalOrigin::Bottom);
+			show,
+			SendMenu::Details{ sendMenuType() },
+			SendMenu::DefaultCallback(show, crl::guard(parent, submit)));
+		if (showForwardOptions || !state->menu->empty()) {
 			state->menu->popup(QCursor::pos());
 		}
 	};
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index cc4f5617865c4..4bf6c4d13fc35 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -91,7 +91,7 @@ void PeerMenuCreatePoll(
 	PollData::Flags chosen = PollData::Flags(),
 	PollData::Flags disabled = PollData::Flags(),
 	Api::SendType sendType = Api::SendType::Normal,
-	SendMenu::Type sendMenuType = SendMenu::Type::Scheduled);
+	SendMenu::Details sendMenuDetails = SendMenu::Details());
 void PeerMenuDeleteTopicWithConfirmation(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<Data::ForumTopic*> topic);
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index d611652f73c58..37acebe474788 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -122,7 +122,7 @@ class MainWindowShow final : public ChatHelpers::Show {
 	rpl::producer<> pauseChanged() const override;
 
 	rpl::producer<bool> adjustShadowLeft() const override;
-	SendMenu::Type sendMenuType() const override;
+	SendMenu::Details sendMenuDetails() const override;
 
 	bool showMediaPreview(
 		Data::FileOrigin origin,
@@ -272,12 +272,12 @@ rpl::producer<bool> MainWindowShow::adjustShadowLeft() const {
 	});
 }
 
-SendMenu::Type MainWindowShow::sendMenuType() const {
+SendMenu::Details MainWindowShow::sendMenuDetails() const {
 	const auto window = _window.get();
 	if (!window) {
-		return SendMenu::Type::Disabled;
+		return SendMenu::Details();
 	}
-	return window->content()->sendMenuType();
+	return window->content()->sendMenuDetails();
 }
 
 bool MainWindowShow::showMediaPreview(

From e120ae6ae6bf526e21125d8fd86f09589c49a65e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 10 May 2024 15:00:30 +0400
Subject: [PATCH 174/400] Pass effect to API for sending.

---
 Telegram/SourceFiles/api/api_polls.cpp        |   3 +
 Telegram/SourceFiles/api/api_sending.cpp      |   9 +
 Telegram/SourceFiles/apiwrap.cpp              |  13 +-
 .../media/stories/media_stories_share.cpp     |  15 +-
 Telegram/SourceFiles/menu/menu_send.cpp       | 165 +++++++++++++++++-
 5 files changed, 194 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_polls.cpp b/Telegram/SourceFiles/api/api_polls.cpp
index b2422af25e5b2..52a5f6d6fd041 100644
--- a/Telegram/SourceFiles/api/api_polls.cpp
+++ b/Telegram/SourceFiles/api/api_polls.cpp
@@ -68,6 +68,9 @@ void Polls::create(
 	if (action.options.shortcutId) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_quick_reply_shortcut;
 	}
+	if (action.options.effectId) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
+	}
 	const auto sendAs = action.options.sendAs;
 	if (sendAs) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_send_as;
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index 9528ae446fa50..cbe617b750b60 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -133,6 +133,9 @@ void SendExistingMedia(
 		flags |= MessageFlag::ShortcutMessage;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_quick_reply_shortcut;
 	}
+	if (action.options.effectId) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
+	}
 
 	session->data().registerMessageRandomId(randomId, newId);
 
@@ -144,6 +147,7 @@ void SendExistingMedia(
 		.date = HistoryItem::NewMessageDate(action.options),
 		.shortcutId = action.options.shortcutId,
 		.postAuthor = messagePostAuthor,
+		.effectId = action.options.effectId,
 	}, media, caption);
 
 	const auto performRequest = [=](const auto &repeatRequest) -> void {
@@ -307,6 +311,9 @@ bool SendDice(MessageToSend &message) {
 		flags |= MessageFlag::ShortcutMessage;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_quick_reply_shortcut;
 	}
+	if (action.options.effectId) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
+	}
 
 	session->data().registerMessageRandomId(randomId, newId);
 
@@ -318,6 +325,7 @@ bool SendDice(MessageToSend &message) {
 		.date = HistoryItem::NewMessageDate(action.options),
 		.shortcutId = action.options.shortcutId,
 		.postAuthor = messagePostAuthor,
+		.effectId = action.options.effectId,
 	}, TextWithEntities(), MTP_messageMediaDice(
 		MTP_int(0),
 		MTP_string(emoji)));
@@ -512,6 +520,7 @@ void SendConfirmedFile(
 			.shortcutId = file->to.options.shortcutId,
 			.postAuthor = messagePostAuthor,
 			.groupedId = groupId,
+			.effectId = file->to.options.effectId,
 		}, caption, media);
 	}
 
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index c16926c73c1bf..0e96bcec10db1 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3383,6 +3383,7 @@ void ApiWrap::forwardMessages(
 				.date = HistoryItem::NewMessageDate(action.options),
 				.shortcutId = action.options.shortcutId,
 				.postAuthor = messagePostAuthor,
+				.effectId = action.options.effectId,
 			}, item);
 			_session->data().registerMessageRandomId(randomId, newId);
 			if (!localIds) {
@@ -3483,6 +3484,7 @@ void ApiWrap::sendSharedContact(
 		.date = HistoryItem::NewMessageDate(action.options),
 		.shortcutId = action.options.shortcutId,
 		.postAuthor = messagePostAuthor,
+		.effectId = action.options.effectId,
 	}, TextWithEntities(), MTP_messageMediaContact(
 		MTP_string(phone),
 		MTP_string(firstName),
@@ -3816,6 +3818,10 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_quick_reply_shortcut;
 			mediaFlags |= MTPmessages_SendMedia::Flag::f_quick_reply_shortcut;
 		}
+		if (action.options.effectId) {
+			sendFlags |= MTPmessages_SendMessage::Flag::f_effect;
+			mediaFlags |= MTPmessages_SendMedia::Flag::f_effect;
+		}
 		lastMessage = history->addNewLocalMessage({
 			.id = newId.msg,
 			.flags = flags,
@@ -3824,6 +3830,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			.date = HistoryItem::NewMessageDate(action.options),
 			.shortcutId = action.options.shortcutId,
 			.postAuthor = messagePostAuthor,
+			.effectId = action.options.effectId,
 		}, sending, media);
 		const auto done = [=](
 				const MTPUpdates &result,
@@ -4162,7 +4169,8 @@ void ApiWrap::sendMediaWithRandomId(
 		| (!sentEntities.v.isEmpty() ? Flag::f_entities : Flag(0))
 		| (options.scheduled ? Flag::f_schedule_date : Flag(0))
 		| (options.sendAs ? Flag::f_send_as : Flag(0))
-		| (options.shortcutId ? Flag::f_quick_reply_shortcut : Flag(0));
+		| (options.shortcutId ? Flag::f_quick_reply_shortcut : Flag(0))
+		| (options.effectId ? Flag::f_effect : Flag(0));
 
 	auto &histories = history->owner().histories();
 	const auto peer = history->peer;
@@ -4271,7 +4279,8 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 		| (sendAs ? Flag::f_send_as : Flag(0))
 		| (album->options.shortcutId
 			? Flag::f_quick_reply_shortcut
-			: Flag(0));
+			: Flag(0))
+		| (album->options.effectId ? Flag::f_effect : Flag(0));
 	auto &histories = history->owner().histories();
 	const auto peer = history->peer;
 	histories.sendPreparedMessage(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.cpp b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
index bfd0e5c0035aa..9d32a126a5ccb 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_share.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
@@ -128,9 +128,7 @@ namespace Media::Stories {
 			if (action.replyTo) {
 				sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to;
 			}
-			const auto silentPost = ShouldSendSilent(
-				threadPeer,
-				action.options);
+			const auto silentPost = ShouldSendSilent(threadPeer, options);
 			if (silentPost) {
 				sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 			}
@@ -140,6 +138,9 @@ namespace Media::Stories {
 			if (options.shortcutId) {
 				sendFlags |= MTPmessages_SendMedia::Flag::f_quick_reply_shortcut;
 			}
+			if (options.effectId) {
+				sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
+			}
 			const auto done = [=] {
 				if (!--state->requests) {
 					if (show->valid()) {
@@ -161,12 +162,10 @@ namespace Media::Stories {
 					MTP_long(randomId),
 					MTPReplyMarkup(),
 					MTPVector<MTPMessageEntity>(),
-					MTP_int(action.options.scheduled),
+					MTP_int(options.scheduled),
 					MTP_inputPeerEmpty(),
-					Data::ShortcutIdToMTP(
-						session,
-						action.options.shortcutId),
-					MTP_long(action.options.effectId)
+					Data::ShortcutIdToMTP(session, options.shortcutId),
+					MTP_long(options.effectId)
 				), [=](
 						const MTPUpdates &result,
 						const MTP::Response &response) {
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 1f216122beb32..6b39559150a11 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -12,9 +12,13 @@ For license and copyright information please follow this link:
 #include "boxes/abstract_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "core/shortcuts.h"
+#include "history/view/media/history_view_sticker.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
 #include "history/view/history_view_schedule_box.h"
 #include "lang/lang_keys.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
 #include "data/data_peer.h"
 #include "data/data_forum.h"
@@ -25,6 +29,9 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_unread_things.h"
 #include "apiwrap.h"
+#include "window/themes/window_theme.h"
+#include "window/section_widget.h"
+#include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
@@ -33,6 +40,33 @@ For license and copyright information please follow this link:
 namespace SendMenu {
 namespace {
 
+class EffectPreview final : public Ui::RpWidget {
+public:
+	EffectPreview(
+		not_null<QWidget*> parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		Details details,
+		QPoint position,
+		const Data::Reaction &effect,
+		Fn<void(Action, Details)> action);
+private:
+	void paintEvent(QPaintEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+
+	void setupGeometry(QPoint position);
+	void setupBackground();
+	void setupSend(Details details);
+
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const std::shared_ptr<Ui::ChatTheme> _theme;
+	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
+	const std::unique_ptr<Ui::FlatButton> _send;
+	const Fn<void(Action, Details)> _actionWithEffect;
+	QRect _inner;
+	QImage _bg;
+
+};
+
 [[nodiscard]] Data::PossibleItemReactionsRef LookupPossibleEffects(
 		not_null<Main::Session*> session) {
 	auto result = Data::PossibleItemReactionsRef();
@@ -51,6 +85,124 @@ namespace {
 	return result;
 }
 
+void ShowEffectPreview(
+		not_null<QWidget*> parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		Details details,
+		QPoint position,
+		const Data::Reaction &effect,
+		Fn<void(Action, Details)> action) {
+	const auto widget = Ui::CreateChild<EffectPreview>(
+		parent,
+		show,
+		details,
+		position,
+		effect,
+		action);
+	widget->raise();
+	widget->show();
+}
+
+[[nodiscard]] Fn<void(Action, Details)> ComposeActionWithEffect(
+		Fn<void(Action, Details)> sendAction,
+		EffectId id) {
+	if (!id) {
+		return sendAction;
+	}
+	return [=](Action action, Details details) {
+		if (const auto options = std::get_if<Api::SendOptions>(&action)) {
+			options->effectId = id;
+		}
+		sendAction(action, details);
+	};
+}
+
+EffectPreview::EffectPreview(
+	not_null<QWidget*> parent,
+	std::shared_ptr<ChatHelpers::Show> show,
+	Details details,
+	QPoint position,
+	const Data::Reaction &effect,
+	Fn<void(Action, Details)> action)
+: RpWidget(parent)
+, _show(show)
+, _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
+, _chatStyle(
+	std::make_unique<Ui::ChatStyle>(
+		_show->session().colorIndicesValue()))
+, _send(
+	std::make_unique<Ui::FlatButton>(
+		this,
+		u"Send with Effect"_q,AssertIsDebug()
+		st::previewMarkRead))
+, _actionWithEffect(ComposeActionWithEffect(action, effect.id.custom())) {
+	setupGeometry(position);
+	setupBackground();
+	setupSend(details);
+}
+
+void EffectPreview::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	p.drawImage(0, 0, _bg);
+}
+
+void EffectPreview::mousePressEvent(QMouseEvent *e) {
+	delete this;
+}
+
+void EffectPreview::setupGeometry(QPoint position) {
+	const auto parent = parentWidget();
+	const auto innerSize = HistoryView::Sticker::MessageEffectSize();
+	const auto shadow = st::previewMenu.shadow;
+	const auto extend = shadow.extend;
+	_inner = QRect(QPoint(extend.left(), extend.top()), innerSize);
+	const auto size = _inner.marginsAdded(extend).size();
+	const auto left = std::max(
+		std::min(
+			position.x() - size.width() / 2,
+			parent->width() - size.width()),
+		0);
+	const auto topMin = std::min((parent->height() - size.height()) / 2, 0);
+	const auto top = std::max(
+		std::min(
+			position.y() - size.height() / 2,
+			parent->height() - size.height()),
+		topMin);
+	setGeometry(left, top, size.width(), size.height() + _send->height());
+	_send->setGeometry(0, size.height(), size.width(), _send->height());
+}
+
+void EffectPreview::setupBackground() {
+	const auto ratio = style::DevicePixelRatio();
+	_bg = QImage(
+		_inner.size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+
+	const auto paint = [=] {
+		auto p = QPainter(&_bg);
+		Window::SectionWidget::PaintBackground(
+			p,
+			_theme.get(),
+			QSize(width(), height() * 5),
+			QRect(QPoint(), size()));
+	};
+	paint();
+	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
+		paint();
+		update();
+	}, lifetime());
+}
+
+void EffectPreview::setupSend(Details details) {
+	_send->setClickedCallback([=] {
+		_actionWithEffect(Api::SendOptions(), details);
+	});
+	const auto type = details.type;
+	SetupMenuAndShortcuts(_send.get(), _show, [=] {
+		return Details{ .type = type };
+	}, _actionWithEffect);
+}
+
 } // namespace
 
 Fn<void(Action, Details)> DefaultCallback(
@@ -131,7 +283,18 @@ FillMenuResult FillSendMenu(
 
 	(*selector)->chosen(
 	) | rpl::start_with_next([=](ChosenReaction chosen) {
-
+		const auto &reactions = showForEffect->session().data().reactions();
+		const auto &effects = reactions.list(Data::Reactions::Type::Effects);
+		const auto i = ranges::find(effects, chosen.id, &Data::Reaction::id);
+		if (i != end(effects)) {
+			ShowEffectPreview(
+				menu,
+				showForEffect,
+				details,
+				menu->mapFromGlobal(chosen.globalGeometry.center()),
+				*i,
+				action);
+		}
 	}, menu->lifetime());
 
 	return FillMenuResult::Prepared;

From 144109db0589096f9432087b960f6a7ec8966496 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 10 May 2024 16:46:14 +0400
Subject: [PATCH 175/400] Show effect preview before sending.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 .../data/components/scheduled_messages.cpp    |   3 +
 Telegram/SourceFiles/menu/menu_send.cpp       | 266 +++++++++++++++---
 Telegram/SourceFiles/ui/chat/chat.style       |   7 +-
 4 files changed, 232 insertions(+), 45 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 3029db104a187..968b7f911ad6f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -563,6 +563,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_effect_add_title" = "Add an animated effect";
 "lng_effect_stickers_title" = "Message Effects";
+"lng_effect_send" = "Send with Effect";
 
 "lng_languages" = "Languages";
 "lng_languages_none" = "No languages found.";
diff --git a/Telegram/SourceFiles/data/components/scheduled_messages.cpp b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
index 4313a88577d0a..c8505c47f8d9d 100644
--- a/Telegram/SourceFiles/data/components/scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
@@ -228,6 +228,9 @@ void ScheduledMessages::sendNowSimpleMessage(
 			: MTPDmessage::Flag(0))
 		| ((localFlags & MessageFlag::Outgoing)
 			? MTPDmessage::Flag::f_out
+			: MTPDmessage::Flag(0))
+		| (local->effectId()
+			? MTPDmessage::Flag::f_effect
 			: MTPDmessage::Flag(0));
 	const auto views = 1;
 	const auto forwards = 0;
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 6b39559150a11..536d988e3c299 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -11,15 +11,22 @@ For license and copyright information please follow this link:
 #include "base/event_filter.h"
 #include "boxes/abstract_box.h"
 #include "chat_helpers/compose/compose_show.h"
+#include "chat_helpers/stickers_emoji_pack.h"
 #include "core/shortcuts.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
 #include "history/view/history_view_schedule_box.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_single_player.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
+#include "ui/painter.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
 #include "data/data_peer.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
@@ -48,25 +55,77 @@ class EffectPreview final : public Ui::RpWidget {
 		Details details,
 		QPoint position,
 		const Data::Reaction &effect,
-		Fn<void(Action, Details)> action);
+		Fn<void(Action, Details)> action,
+		Fn<void()> done);
+
 private:
 	void paintEvent(QPaintEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
 
 	void setupGeometry(QPoint position);
 	void setupBackground();
+	void repaintBackground();
+	void setupLottie();
 	void setupSend(Details details);
+	void createLottie();
 
+	[[nodiscard]] bool checkReady();
+
+	const Data::Reaction _effect;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const std::shared_ptr<Ui::ChatTheme> _theme;
 	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
 	const std::unique_ptr<Ui::FlatButton> _send;
 	const Fn<void(Action, Details)> _actionWithEffect;
+
+	QImage _icon;
+	std::shared_ptr<Data::DocumentMedia> _media;
+	QByteArray _bytes;
+	QString _filepath;
+	std::unique_ptr<Lottie::SinglePlayer> _lottie;
+
 	QRect _inner;
 	QImage _bg;
 
+	rpl::lifetime _readyCheckLifetime;
+
+};
+
+class BottomRounded final : public Ui::FlatButton {
+public:
+	using FlatButton::FlatButton;
+
+private:
+	QImage prepareRippleMask() const override;
+	void paintEvent(QPaintEvent *e) override;
+
 };
 
+QImage BottomRounded::prepareRippleMask() const {
+	const auto fill = false;
+	return Ui::RippleAnimation::MaskByDrawer(size(), fill, [&](QPainter &p) {
+		const auto radius = st::previewMenu.radius;
+		const auto expanded = rect().marginsAdded({ 0, 2 * radius, 0, 0 });
+		p.drawRoundedRect(expanded, radius, radius);
+	});
+}
+
+void BottomRounded::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto radius = st::previewMenu.radius;
+	const auto expanded = rect().marginsAdded({ 0, 2 * radius, 0, 0 });
+	p.setPen(Qt::NoPen);
+	const auto &st = st::previewMarkRead;
+	if (isOver()) {
+		p.setBrush(st.overBgColor);
+	}
+	p.drawRoundedRect(expanded, radius, radius);
+	p.end();
+
+	Ui::FlatButton::paintEvent(e);
+}
+
 [[nodiscard]] Data::PossibleItemReactionsRef LookupPossibleEffects(
 		not_null<Main::Session*> session) {
 	auto result = Data::PossibleItemReactionsRef();
@@ -85,35 +144,19 @@ class EffectPreview final : public Ui::RpWidget {
 	return result;
 }
 
-void ShowEffectPreview(
-		not_null<QWidget*> parent,
-		std::shared_ptr<ChatHelpers::Show> show,
-		Details details,
-		QPoint position,
-		const Data::Reaction &effect,
-		Fn<void(Action, Details)> action) {
-	const auto widget = Ui::CreateChild<EffectPreview>(
-		parent,
-		show,
-		details,
-		position,
-		effect,
-		action);
-	widget->raise();
-	widget->show();
-}
-
 [[nodiscard]] Fn<void(Action, Details)> ComposeActionWithEffect(
 		Fn<void(Action, Details)> sendAction,
-		EffectId id) {
-	if (!id) {
-		return sendAction;
-	}
+		EffectId id,
+		Fn<void()> done) {
 	return [=](Action action, Details details) {
 		if (const auto options = std::get_if<Api::SendOptions>(&action)) {
 			options->effectId = id;
 		}
+		const auto onstack = done;
 		sendAction(action, details);
+		if (onstack) {
+			onstack();
+		}
 	};
 }
 
@@ -123,27 +166,49 @@ EffectPreview::EffectPreview(
 	Details details,
 	QPoint position,
 	const Data::Reaction &effect,
-	Fn<void(Action, Details)> action)
+	Fn<void(Action, Details)> action,
+	Fn<void()> done)
 : RpWidget(parent)
+, _effect(effect)
 , _show(show)
 , _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
 , _chatStyle(
 	std::make_unique<Ui::ChatStyle>(
 		_show->session().colorIndicesValue()))
 , _send(
-	std::make_unique<Ui::FlatButton>(
+	std::make_unique<BottomRounded>(
 		this,
-		u"Send with Effect"_q,AssertIsDebug()
-		st::previewMarkRead))
-, _actionWithEffect(ComposeActionWithEffect(action, effect.id.custom())) {
+		tr::lng_effect_send(tr::now),
+		st::effectPreviewSend))
+, _actionWithEffect(
+	ComposeActionWithEffect(
+		action,
+		effect.id.custom(),
+		done)) {
 	setupGeometry(position);
 	setupBackground();
+	setupLottie();
 	setupSend(details);
 }
 
 void EffectPreview::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 	p.drawImage(0, 0, _bg);
+
+	if (_lottie && _lottie->ready()) {
+		const auto factor = style::DevicePixelRatio();
+		auto request = Lottie::FrameRequest();
+		request.box = _inner.size() * factor;
+		const auto rightAligned = false;// hasRightLayout();
+		if (!rightAligned) {
+			request.mirrorHorizontal = true;
+		}
+		const auto frame = _lottie->frameInfo(request);
+		p.drawImage(
+			QRect(_inner.topLeft(), frame.image.size() / factor),
+			frame.image);
+		_lottie->markFrameShown();
+	}
 }
 
 void EffectPreview::mousePressEvent(QMouseEvent *e) {
@@ -156,7 +221,8 @@ void EffectPreview::setupGeometry(QPoint position) {
 	const auto shadow = st::previewMenu.shadow;
 	const auto extend = shadow.extend;
 	_inner = QRect(QPoint(extend.left(), extend.top()), innerSize);
-	const auto size = _inner.marginsAdded(extend).size();
+	const auto size = _inner.marginsAdded(extend).size()
+		+ QSize(0, _send->height());
 	const auto left = std::max(
 		std::min(
 			position.x() - size.width() / 2,
@@ -168,29 +234,112 @@ void EffectPreview::setupGeometry(QPoint position) {
 			position.y() - size.height() / 2,
 			parent->height() - size.height()),
 		topMin);
-	setGeometry(left, top, size.width(), size.height() + _send->height());
-	_send->setGeometry(0, size.height(), size.width(), _send->height());
+	setGeometry(left, top, size.width(), size.height());
+	_send->setGeometry(
+		_inner.x(),
+		_inner.y() + _inner.height(),
+		_inner.width(),
+		_send->height());
 }
 
 void EffectPreview::setupBackground() {
 	const auto ratio = style::DevicePixelRatio();
 	_bg = QImage(
-		_inner.size() * ratio,
+		size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	_bg.setDevicePixelRatio(ratio);
+	repaintBackground();
+	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
+		repaintBackground();
+		update();
+	}, lifetime());
+}
+
+void EffectPreview::repaintBackground() {
+	const auto ratio = style::DevicePixelRatio();
+	const auto inner = _inner.size() + QSize(0, _send->height());
+	auto bg = QImage(
+		inner * ratio,
 		QImage::Format_ARGB32_Premultiplied);
+	bg.setDevicePixelRatio(ratio);
 
-	const auto paint = [=] {
-		auto p = QPainter(&_bg);
+	{
+		auto p = QPainter(&bg);
 		Window::SectionWidget::PaintBackground(
 			p,
 			_theme.get(),
-			QSize(width(), height() * 5),
-			QRect(QPoint(), size()));
-	};
-	paint();
-	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
-		paint();
-		update();
-	}, lifetime());
+			QSize(inner.width(), inner.height() * 5),
+			QRect(QPoint(), inner));
+
+		{ // bubble
+			const auto radius = st::bubbleRadiusLarge;
+			const auto out = 2 * radius;
+			p.setPen(Qt::NoPen);
+			p.setBrush(_chatStyle->msgInShadow());
+			const auto skip = st::msgPadding.bottom() - st::msgDateDelta.y();
+			p.drawRoundedRect(-out, -out, out + inner.width() / 3, out + inner.height() / 2 + st::normalFont->height / 2 + st::msgShadow, radius, radius);
+			p.setBrush(_chatStyle->msgInBg());
+			p.drawRoundedRect(-out, -out, out + inner.width() / 3, out + inner.height() / 2 + st::normalFont->height / 2, radius, radius);
+
+			if (!_icon.isNull()) {
+				p.drawImage(
+					inner.width() / 3 - _icon.width(),
+					inner.height() / 2 + st::normalFont->height / 2 - _icon.height(),
+					_icon);
+			}
+		}
+
+		p.fillRect(
+			QRect(0, _inner.height(), _inner.width(), _send->height()),
+			st::previewMarkRead.bgColor);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+		auto roundRect = Ui::RoundRect(st::previewMenu.radius, st::menuBg);
+		roundRect.paint(p, QRect(QPoint(), inner), RectPart::AllCorners);
+	}
+
+	_bg.fill(Qt::transparent);
+	auto p = QPainter(&_bg);
+	const auto &shadow = st::previewMenu.animation.shadow;
+	const auto shadowed = QRect(_inner.topLeft(), inner);
+	Ui::Shadow::paint(p, shadowed, width(), shadow);
+	p.drawImage(_inner.topLeft(), bg);
+}
+
+void EffectPreview::setupLottie() {
+	const auto id = _effect.id.custom();
+	const auto reactions = &_show->session().data().reactions();
+	reactions->preloadEffectImageFor(id);
+
+	if (const auto document = _effect.aroundAnimation) {
+		_media = document->createMediaView();
+	} else {
+		_media = _effect.selectAnimation->createMediaView();
+	}
+	rpl::single(rpl::empty) | rpl::then(
+		_show->session().downloaderTaskFinished()
+	) | rpl::start_with_next([=] {
+		if (checkReady()) {
+			_readyCheckLifetime.destroy();
+			createLottie();
+		}
+	}, _readyCheckLifetime);
+}
+
+void EffectPreview::createLottie() {
+	_lottie = _show->session().emojiStickersPack().effectPlayer(
+		_media->owner(),
+		_bytes,
+		_filepath,
+		Stickers::EffectType::MessageEffect);
+	const auto raw = _lottie.get();
+	raw->updates(
+	) | rpl::start_with_next([=](Lottie::Update update) {
+		v::match(update.data, [&](const Lottie::Information &information) {
+		}, [&](const Lottie::DisplayFrameRequest &request) {
+			this->update();
+		});
+	}, raw->lifetime());
 }
 
 void EffectPreview::setupSend(Details details) {
@@ -203,6 +352,22 @@ void EffectPreview::setupSend(Details details) {
 	}, _actionWithEffect);
 }
 
+bool EffectPreview::checkReady() {
+	if (_icon.isNull()) {
+		const auto reactions = &_show->session().data().reactions();
+		_icon = reactions->resolveEffectImageFor(_effect.id.custom());
+		repaintBackground();
+		update();
+	}
+	if (_effect.aroundAnimation) {
+		_bytes = _media->bytes();
+		_filepath = _media->owner()->filepath();
+	} else {
+		_bytes = _media->videoThumbnailContent();
+	}
+	return !_icon.isNull() && (!_bytes.isEmpty() || !_filepath.isEmpty());
+}
+
 } // namespace
 
 Fn<void(Action, Details)> DefaultCallback(
@@ -281,19 +446,32 @@ FillMenuResult FillSendMenu(
 		return FillMenuResult::Prepared;
 	}
 
+	const auto effect = std::make_shared<QPointer<EffectPreview>>();
 	(*selector)->chosen(
 	) | rpl::start_with_next([=](ChosenReaction chosen) {
 		const auto &reactions = showForEffect->session().data().reactions();
 		const auto &effects = reactions.list(Data::Reactions::Type::Effects);
 		const auto i = ranges::find(effects, chosen.id, &Data::Reaction::id);
 		if (i != end(effects)) {
-			ShowEffectPreview(
+			if (const auto strong = effect->data()) {
+				delete strong;
+			}
+			const auto weak = Ui::MakeWeak(menu);
+			const auto done = [=] {
+				delete effect->data();
+				if (const auto strong = weak.data()) {
+					strong->hideMenu(true);
+				}
+			};
+			*effect = Ui::CreateChild<EffectPreview>(
 				menu,
 				showForEffect,
 				details,
 				menu->mapFromGlobal(chosen.globalGeometry.center()),
 				*i,
-				action);
+				action,
+				crl::guard(menu, done));
+			(*effect)->show();
 		}
 	}, menu->lifetime());
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 302c5b593d2e4..f194dc8aa281a 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1101,7 +1101,7 @@ previewTop: PeerListItem(defaultPeerListItem) {
 	photoSize: 40px;
 }
 previewMarkRead: FlatButton(historyComposeButton) {
-	height: 40px;
+	height: 39px;
 	textTop: 10px;
 }
 previewName: FlatLabel(defaultFlatLabel) {
@@ -1115,3 +1115,8 @@ previewUserpic: UserpicButton(defaultUserpicButton) {
 	size: size(40px, 40px);
 	photoSize: 40px;
 }
+
+effectPreviewSend: FlatButton(previewMarkRead) {
+	bgColor: transparent;
+	overBgColor: transparent;
+}

From f371cd1af2c1be3c08fe75bb519047259b34a711 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 11 May 2024 17:46:40 +0400
Subject: [PATCH 176/400] Use nice fake message for effect preview.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../boxes/reactions_settings_box.cpp          |  56 +-------
 .../history/view/history_view_fake_items.cpp  |  66 ++++++++++
 .../history/view/history_view_fake_items.h    |  26 ++++
 Telegram/SourceFiles/menu/menu_send.cpp       | 122 +++++++++++++-----
 5 files changed, 191 insertions(+), 81 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/history_view_fake_items.cpp
 create mode 100644 Telegram/SourceFiles/history/view/history_view_fake_items.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 6426c644676ac..21e22150dff28 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -799,6 +799,8 @@ PRIVATE
     history/view/history_view_emoji_interactions.h
     history/view/history_view_empty_list_bubble.cpp
     history/view/history_view_empty_list_bubble.h
+    history/view/history_view_fake_items.cpp
+    history/view/history_view_fake_items.h
     history/view/history_view_group_call_bar.cpp
     history/view/history_view_group_call_bar.h
     history/view/history_view_item_preview.h
diff --git a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
index e336244039ad5..8a71e395b89d1 100644
--- a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
+++ b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
@@ -16,8 +16,9 @@ For license and copyright information please follow this link:
 #include "history/admin_log/history_admin_log_item.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "history/view/history_view_element.h"
 #include "history/view/reactions/history_view_reactions_strip.h"
+#include "history/view/history_view_element.h"
+#include "history/view/history_view_fake_items.h"
 #include "lang/lang_keys.h"
 #include "boxes/premium_preview_box.h"
 #include "main/main_session.h"
@@ -43,53 +44,6 @@ For license and copyright information please follow this link:
 
 namespace {
 
-PeerId GenerateUser(not_null<History*> history, const QString &name) {
-	Expects(history->peer->isUser());
-
-	const auto peerId = Data::FakePeerIdForJustName(name);
-	history->owner().processUser(MTP_user(
-		MTP_flags(MTPDuser::Flag::f_first_name | MTPDuser::Flag::f_min),
-		peerToBareMTPInt(peerId),
-		MTP_long(0),
-		MTP_string(tr::lng_settings_chat_message_reply_from(tr::now)),
-		MTPstring(), // last name
-		MTPstring(), // username
-		MTPstring(), // phone
-		MTPUserProfilePhoto(), // profile photo
-		MTPUserStatus(), // status
-		MTP_int(0), // bot info version
-		MTPVector<MTPRestrictionReason>(), // restrictions
-		MTPstring(), // bot placeholder
-		MTPstring(), // lang code
-		MTPEmojiStatus(),
-		MTPVector<MTPUsername>(),
-		MTPint(), // stories_max_id
-		MTPPeerColor(), // color
-		MTPPeerColor())); // profile_color
-	return peerId;
-}
-
-AdminLog::OwnedItem GenerateItem(
-		not_null<HistoryView::ElementDelegate*> delegate,
-		not_null<History*> history,
-		PeerId from,
-		FullMsgId replyTo,
-		const QString &text) {
-	Expects(history->peer->isUser());
-
-	const auto item = history->addNewLocalMessage({
-		.id = history->nextNonHistoryEntryId(),
-		.flags = (MessageFlag::FakeHistoryItem
-			| MessageFlag::HasFromId
-			| MessageFlag::HasReplyInfo),
-		.from = from,
-		.replyTo = FullReplyTo{ .messageId = replyTo },
-		.date = base::unixtime::now(),
-	}, TextWithEntities{ .text = text }, MTP_messageMediaEmpty());
-
-	return AdminLog::OwnedItem(delegate, item);
-}
-
 void AddMessage(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
@@ -135,15 +89,15 @@ void AddMessage(
 
 	const auto history = controller->session().data().history(
 		PeerData::kServiceNotificationsId);
-	state->reply = GenerateItem(
+	state->reply = HistoryView::GenerateItem(
 		state->delegate.get(),
 		history,
-		GenerateUser(
+		HistoryView::GenerateUser(
 			history,
 			tr::lng_settings_chat_message_reply_from(tr::now)),
 		FullMsgId(),
 		tr::lng_settings_chat_message_reply(tr::now));
-	auto message = GenerateItem(
+	auto message = HistoryView::GenerateItem(
 		state->delegate.get(),
 		history,
 		history->peer->id,
diff --git a/Telegram/SourceFiles/history/view/history_view_fake_items.cpp b/Telegram/SourceFiles/history/view/history_view_fake_items.cpp
new file mode 100644
index 0000000000000..5a6538036fb40
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_fake_items.cpp
@@ -0,0 +1,66 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_fake_items.h"
+
+#include "base/unixtime.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+
+namespace HistoryView {
+
+AdminLog::OwnedItem GenerateItem(
+		not_null<HistoryView::ElementDelegate*> delegate,
+		not_null<History*> history,
+		PeerId from,
+		FullMsgId replyTo,
+		const QString &text,
+		EffectId effectId) {
+	Expects(history->peer->isUser());
+
+	const auto item = history->addNewLocalMessage({
+		.id = history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeHistoryItem
+			| MessageFlag::HasFromId
+			| MessageFlag::HasReplyInfo),
+		.from = from,
+		.replyTo = FullReplyTo{.messageId = replyTo },
+		.date = base::unixtime::now(),
+		.effectId = effectId,
+	}, TextWithEntities{ .text = text }, MTP_messageMediaEmpty());
+
+	return AdminLog::OwnedItem(delegate, item);
+}
+
+PeerId GenerateUser(not_null<History*> history, const QString &name) {
+	Expects(history->peer->isUser());
+
+	const auto peerId = Data::FakePeerIdForJustName(name);
+	history->owner().processUser(MTP_user(
+		MTP_flags(MTPDuser::Flag::f_first_name | MTPDuser::Flag::f_min),
+		peerToBareMTPInt(peerId),
+		MTP_long(0),
+		MTP_string(name),
+		MTPstring(), // last name
+		MTPstring(), // username
+		MTPstring(), // phone
+		MTPUserProfilePhoto(), // profile photo
+		MTPUserStatus(), // status
+		MTP_int(0), // bot info version
+		MTPVector<MTPRestrictionReason>(), // restrictions
+		MTPstring(), // bot placeholder
+		MTPstring(), // lang code
+		MTPEmojiStatus(),
+		MTPVector<MTPUsername>(),
+		MTPint(), // stories_max_id
+		MTPPeerColor(), // color
+		MTPPeerColor())); // profile_color
+	return peerId;
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_fake_items.h b/Telegram/SourceFiles/history/view/history_view_fake_items.h
new file mode 100644
index 0000000000000..266c280042bcd
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_fake_items.h
@@ -0,0 +1,26 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "history/admin_log/history_admin_log_item.h"
+
+namespace HistoryView {
+
+[[nodiscard]] AdminLog::OwnedItem GenerateItem(
+	not_null<HistoryView::ElementDelegate*> delegate,
+	not_null<History*> history,
+	PeerId from,
+	FullMsgId replyTo,
+	const QString &text,
+	EffectId effectId = 0);
+
+[[nodiscard]] PeerId GenerateUser(
+	not_null<History*> history,
+	const QString &name);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 536d988e3c299..f04662997254b 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -9,17 +9,25 @@ For license and copyright information please follow this link:
 
 #include "api/api_common.h"
 #include "base/event_filter.h"
+#include "base/unixtime.h"
 #include "boxes/abstract_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/shortcuts.h"
+#include "history/admin_log/history_admin_log_item.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
+#include "history/view/history_view_element.h"
+#include "history/view/history_view_fake_items.h"
 #include "history/view/history_view_schedule_box.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_unread_things.h"
 #include "lang/lang_keys.h"
 #include "lottie/lottie_single_player.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
+#include "ui/effects/path_shift_gradient.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
@@ -33,20 +41,39 @@ For license and copyright information please follow this link:
 #include "data/data_message_reactions.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
-#include "history/history.h"
-#include "history/history_unread_things.h"
 #include "apiwrap.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_window.h"
 
 #include <QtWidgets/QApplication>
 
 namespace SendMenu {
 namespace {
 
+class Delegate final : public HistoryView::DefaultElementDelegate {
+public:
+	Delegate(not_null<Ui::PathShiftGradient*> pathGradient)
+	: _pathGradient(pathGradient) {
+	}
+
+private:
+	bool elementAnimationsPaused() override {
+		return false;
+	}
+	not_null<Ui::PathShiftGradient*> elementPathShiftGradient() override {
+		return _pathGradient;
+	}
+	HistoryView::Context elementContext() override {
+		return HistoryView::Context::ContactPreview;
+	}
+
+	const not_null<Ui::PathShiftGradient*> _pathGradient;
+};
+
 class EffectPreview final : public Ui::RpWidget {
 public:
 	EffectPreview(
@@ -64,6 +91,7 @@ class EffectPreview final : public Ui::RpWidget {
 
 	void setupGeometry(QPoint position);
 	void setupBackground();
+	void setupItem();
 	void repaintBackground();
 	void setupLottie();
 	void setupSend(Details details);
@@ -71,10 +99,16 @@ class EffectPreview final : public Ui::RpWidget {
 
 	[[nodiscard]] bool checkReady();
 
+	const EffectId _effectId = 0;
 	const Data::Reaction _effect;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const std::shared_ptr<Ui::ChatTheme> _theme;
 	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
+	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
+	const std::unique_ptr<Delegate> _delegate;
+	const not_null<History*> _history;
+	const AdminLog::OwnedItem _replyTo;
+	const AdminLog::OwnedItem _item;
 	const std::unique_ptr<Ui::FlatButton> _send;
 	const Fn<void(Action, Details)> _actionWithEffect;
 
@@ -86,6 +120,7 @@ class EffectPreview final : public Ui::RpWidget {
 
 	QRect _inner;
 	QImage _bg;
+	QPoint _itemShift;
 
 	rpl::lifetime _readyCheckLifetime;
 
@@ -169,37 +204,67 @@ EffectPreview::EffectPreview(
 	Fn<void(Action, Details)> action,
 	Fn<void()> done)
 : RpWidget(parent)
+, _effectId(effect.id.custom())
 , _effect(effect)
 , _show(show)
 , _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
 , _chatStyle(
 	std::make_unique<Ui::ChatStyle>(
 		_show->session().colorIndicesValue()))
+, _pathGradient(
+	HistoryView::MakePathShiftGradient(_chatStyle.get(), [=] { update(); }))
+, _delegate(std::make_unique<Delegate>(_pathGradient.get()))
+, _history(show->session().data().history(
+	PeerData::kServiceNotificationsId))
+, _replyTo(HistoryView::GenerateItem(
+	_delegate.get(),
+	_history,
+	HistoryView::GenerateUser(
+		_history,
+		tr::lng_settings_chat_message_reply_from(tr::now)),
+	FullMsgId(),
+	tr::lng_settings_chat_message(tr::now)))
+, _item(HistoryView::GenerateItem(
+	_delegate.get(),
+	_history,
+	_history->peer->id,
+	_replyTo->data()->fullId(),
+	tr::lng_settings_chat_message_reply(tr::now),
+	_effectId))
 , _send(
 	std::make_unique<BottomRounded>(
 		this,
 		tr::lng_effect_send(tr::now),
 		st::effectPreviewSend))
-, _actionWithEffect(
-	ComposeActionWithEffect(
-		action,
-		effect.id.custom(),
-		done)) {
+, _actionWithEffect(ComposeActionWithEffect(action, _effectId, done)) {
 	setupGeometry(position);
 	setupBackground();
+	setupItem();
 	setupLottie();
 	setupSend(details);
 }
 
 void EffectPreview::paintEvent(QPaintEvent *e) {
-	auto p = QPainter(this);
+	auto p = Painter(this);
 	p.drawImage(0, 0, _bg);
 
+	p.setClipRect(_inner);
+	p.translate(_itemShift);
+	auto rect = QRect(0, 0, st::windowMinWidth, _inner.height());
+	auto context = _theme->preparePaintContext(
+		_chatStyle.get(),
+		rect,
+		rect,
+		false);
+	context.outbg = _item->hasOutLayout();
+	_item->draw(p, context);
+	p.translate(-_itemShift);
+
 	if (_lottie && _lottie->ready()) {
 		const auto factor = style::DevicePixelRatio();
 		auto request = Lottie::FrameRequest();
 		request.box = _inner.size() * factor;
-		const auto rightAligned = false;// hasRightLayout();
+		const auto rightAligned = _item->hasRightLayout();
 		if (!rightAligned) {
 			request.mirrorHorizontal = true;
 		}
@@ -255,6 +320,22 @@ void EffectPreview::setupBackground() {
 	}, lifetime());
 }
 
+void EffectPreview::setupItem() {
+	_item->resizeGetHeight(st::windowMinWidth);
+
+	const auto icon = _item->effectIconGeometry();
+	Assert(!icon.isEmpty());
+
+	const auto size = _inner.size();
+	const auto shift = _item->hasRightLayout()
+		? (-size.width() / 3)
+		: (size.width() / 3);
+	const auto position = QPoint(
+		shift + icon.x() + (icon.width() - size.width()) / 2,
+		icon.y() + (icon.height() - size.height()) / 2);
+	_itemShift = _inner.topLeft() - position;
+}
+
 void EffectPreview::repaintBackground() {
 	const auto ratio = style::DevicePixelRatio();
 	const auto inner = _inner.size() + QSize(0, _send->height());
@@ -270,25 +351,6 @@ void EffectPreview::repaintBackground() {
 			_theme.get(),
 			QSize(inner.width(), inner.height() * 5),
 			QRect(QPoint(), inner));
-
-		{ // bubble
-			const auto radius = st::bubbleRadiusLarge;
-			const auto out = 2 * radius;
-			p.setPen(Qt::NoPen);
-			p.setBrush(_chatStyle->msgInShadow());
-			const auto skip = st::msgPadding.bottom() - st::msgDateDelta.y();
-			p.drawRoundedRect(-out, -out, out + inner.width() / 3, out + inner.height() / 2 + st::normalFont->height / 2 + st::msgShadow, radius, radius);
-			p.setBrush(_chatStyle->msgInBg());
-			p.drawRoundedRect(-out, -out, out + inner.width() / 3, out + inner.height() / 2 + st::normalFont->height / 2, radius, radius);
-
-			if (!_icon.isNull()) {
-				p.drawImage(
-					inner.width() / 3 - _icon.width(),
-					inner.height() / 2 + st::normalFont->height / 2 - _icon.height(),
-					_icon);
-			}
-		}
-
 		p.fillRect(
 			QRect(0, _inner.height(), _inner.width(), _send->height()),
 			st::previewMarkRead.bgColor);
@@ -300,6 +362,7 @@ void EffectPreview::repaintBackground() {
 
 	_bg.fill(Qt::transparent);
 	auto p = QPainter(&_bg);
+
 	const auto &shadow = st::previewMenu.animation.shadow;
 	const auto shadowed = QRect(_inner.topLeft(), inner);
 	Ui::Shadow::paint(p, shadowed, width(), shadow);
@@ -307,9 +370,8 @@ void EffectPreview::repaintBackground() {
 }
 
 void EffectPreview::setupLottie() {
-	const auto id = _effect.id.custom();
 	const auto reactions = &_show->session().data().reactions();
-	reactions->preloadEffectImageFor(id);
+	reactions->preloadEffectImageFor(_effectId);
 
 	if (const auto document = _effect.aroundAnimation) {
 		_media = document->createMediaView();

From 5fb7992b04589ed8e66b8f3dfc7add1a45d0d56b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 11 May 2024 19:08:22 +0400
Subject: [PATCH 177/400] Improve effect initial auto-play.

---
 Telegram/SourceFiles/data/data_types.h        |  2 +-
 Telegram/SourceFiles/history/history.cpp      |  7 +++++
 Telegram/SourceFiles/history/history.h        |  1 +
 .../history/history_inner_widget.cpp          | 24 +++++++++++------
 .../history/history_inner_widget.h            |  1 +
 Telegram/SourceFiles/history/history_item.cpp | 27 +++++++++++++++----
 Telegram/SourceFiles/history/history_item.h   |  2 ++
 .../SourceFiles/history/history_widget.cpp    |  3 +++
 8 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index 4d0e5b3d74863..66e041c0f6717 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -322,7 +322,7 @@ enum class MessageFlag : uint64 {
 
 	ShortcutMessage       = (1ULL << 44),
 
-	EffectWatchedLocal    = (1ULL << 45),
+	EffectWatched         = (1ULL << 45),
 };
 inline constexpr bool is_flag_type(MessageFlag) { return true; }
 using MessageFlags = base::flags<MessageFlag>;
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 02a3324b9f8ca..754791e80d7ee 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -1753,6 +1753,10 @@ MsgId History::loadAroundId() const {
 	return MsgId(0);
 }
 
+bool History::inboxReadTillKnown() const {
+	return _inboxReadBefore.has_value();
+}
+
 MsgId History::inboxReadTillId() const {
 	return _inboxReadBefore.value_or(1) - 1;
 }
@@ -2927,6 +2931,9 @@ void History::setInboxReadTill(MsgId upTo) {
 		accumulate_max(*_inboxReadBefore, upTo + 1);
 	} else {
 		_inboxReadBefore = upTo + 1;
+		for (const auto &item : _items) {
+			item->applyEffectWatchedOnUnreadKnown();
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 729b66045cbe5..73695785fa03c 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -218,6 +218,7 @@ class History final : public Data::Thread {
 	void outboxRead(MsgId upTo);
 	void outboxRead(not_null<const HistoryItem*> wasRead);
 	[[nodiscard]] MsgId loadAroundId() const;
+	[[nodiscard]] bool inboxReadTillKnown() const;
 	[[nodiscard]] MsgId inboxReadTillId() const;
 	[[nodiscard]] MsgId outboxReadTillId() const;
 
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 3b51df0d716f0..38483247d9305 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -908,6 +908,14 @@ Ui::ChatPaintContext HistoryInner::preparePaintContext(
 	});
 }
 
+void HistoryInner::startEffectOnRead(not_null<HistoryItem*> item) {
+	if (item->history() == _history) {
+		if (const auto view = item->mainView()) {
+			_emojiInteractions->playEffectOnRead(view);
+		}
+	}
+}
+
 void HistoryInner::paintEvent(QPaintEvent *e) {
 	if (_controller->contentOverlapped(this, e)
 		|| hasPendingResizedItems()) {
@@ -962,13 +970,13 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 			_translateTracker->add(_pinnedItem);
 		}
 		_translateTracker->finishBunch();
+		if (!startEffects.empty()) {
+			for (const auto &view : startEffects) {
+				_emojiInteractions->playEffectOnRead(view);
+			}
+		}
 		if (readTill && _widget->markingMessagesRead()) {
 			session().data().histories().readInboxTill(readTill);
-			if (!startEffects.empty()) {
-				for (const auto &view : startEffects) {
-					_emojiInteractions->playEffectOnRead(view);
-				}
-			}
 		}
 		if (markingAsViewed && !readContents.empty()) {
 			session().api().markContentsRead(readContents);
@@ -1002,9 +1010,9 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 				session().sponsoredMessages().view(item->fullId());
 			} else if (isUnread) {
 				readTill = item;
-				if (item->hasUnwatchedEffect()) {
-					startEffects.emplace(view);
-				}
+			}
+			if (markingAsViewed && item->hasUnwatchedEffect()) {
+				startEffects.emplace(view);
 			}
 			if (markingAsViewed && item->hasViews()) {
 				session().api().views().scheduleIncrement(item);
diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h
index 2ab1207a1624a..5a11b2944a48d 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.h
+++ b/Telegram/SourceFiles/history/history_inner_widget.h
@@ -174,6 +174,7 @@ class HistoryInner
 		not_null<const Element*> view,
 		Element *replacing);
 
+	void startEffectOnRead(not_null<HistoryItem*> item);
 	void updateBotInfo(bool recount = true);
 
 	bool wasSelectedText() const;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 7e929a816cff4..7cb74b1891bab 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -369,6 +369,9 @@ HistoryItem::HistoryItem(
 }) {
 	_boostsApplied = data.vfrom_boosts_applied().value_or_empty();
 
+	// Called only for server-received messages, not locally created ones.
+	applyInitialEffectWatched();
+
 	const auto media = data.vmedia();
 	const auto checked = media
 		? CheckMessageMedia(*media)
@@ -1287,17 +1290,14 @@ bool HistoryItem::hasUnreadReaction() const {
 }
 
 bool HistoryItem::hasUnwatchedEffect() const {
-	return !out()
-		&& effectId()
-		&& !(_flags & MessageFlag::EffectWatchedLocal)
-		&& unread(history());
+	return effectId() && !(_flags & MessageFlag::EffectWatched);
 }
 
 bool HistoryItem::markEffectWatched() {
 	if (!hasUnwatchedEffect()) {
 		return false;
 	}
-	_flags |= MessageFlag::EffectWatchedLocal;
+	_flags |= MessageFlag::EffectWatched;
 	return true;
 }
 
@@ -3480,6 +3480,23 @@ void HistoryItem::setupForwardedComponent(const CreateConfig &config) {
 	forwarded->imported = config.imported;
 }
 
+void HistoryItem::applyInitialEffectWatched() {
+	if (!effectId()) {
+		return;
+	} else if (out()) {
+		// If this message came from the server, not generated on send.
+		_flags |= MessageFlag::EffectWatched;
+	} else if (_history->inboxReadTillId() && !unread(_history)) {
+		_flags |= MessageFlag::EffectWatched;
+	}
+}
+
+void HistoryItem::applyEffectWatchedOnUnreadKnown() {
+	if (effectId() && !out() && !unread(_history)) {
+		_flags |= MessageFlag::EffectWatched;
+	}
+}
+
 bool HistoryItem::generateLocalEntitiesByReply() const {
 	using namespace HistoryView;
 	if (!_media) {
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 1a276a447035a..1b006e35a7e6c 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -400,6 +400,7 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	void setPostAuthor(const QString &author);
 	void setRealId(MsgId newId);
 	void incrementReplyToTopCounter();
+	void applyEffectWatchedOnUnreadKnown();
 
 	[[nodiscard]] bool emptyText() const {
 		return _text.empty();
@@ -547,6 +548,7 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	void createComponentsHelper(HistoryItemCommonFields &&fields);
 	void createComponents(CreateConfig &&config);
 	void setupForwardedComponent(const CreateConfig &config);
+	void applyInitialEffectWatched();
 
 	[[nodiscard]] bool generateLocalEntitiesByReply() const;
 	[[nodiscard]] TextWithEntities withLocalEntities(
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index e769001801c92..ca3803cff8684 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3255,6 +3255,9 @@ void HistoryWidget::newItemAdded(not_null<HistoryItem*> item) {
 	if (item->showNotification()) {
 		destroyUnreadBar();
 		if (markingMessagesRead()) {
+			if (_list && item->hasUnwatchedEffect()) {
+				_list->startEffectOnRead(item);
+			}
 			if (item->isUnreadMention() && !item->isUnreadMedia()) {
 				session().api().markContentsRead(item);
 			}

From b92a05011f1f079731ad539aeafe65c75e21bf32 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 12 May 2024 12:49:28 +0400
Subject: [PATCH 178/400] Show sticker effects in a StickerListWidget.

---
 .../chat_helpers/chat_helpers.style           |   1 +
 .../chat_helpers/stickers_list_widget.cpp     | 104 ++++++++++++++----
 .../chat_helpers/stickers_list_widget.h       |  14 ++-
 .../data/data_message_reactions.cpp           |   3 +
 .../SourceFiles/data/data_message_reactions.h |   2 +
 .../history_view_reactions_selector.cpp       |  62 +++++++++--
 .../history_view_reactions_selector.h         |   4 +
 Telegram/SourceFiles/menu/menu_send.cpp       |   7 +-
 8 files changed, 163 insertions(+), 34 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 73dc78f2392b8..538c247b96dd5 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -489,6 +489,7 @@ hashtagClose: IconButton {
 
 stickerPanWidthMin: 64px;
 stickerPanSize: size(stickerPanWidthMin, stickerPanWidthMin);
+stickerEffectWidthMin: 48px;
 stickerPanPadding: 11px;
 stickerPanDeleteIconBg: icon {{ "emoji/emoji_delete_bg", stickerPanDeleteBg }};
 stickerPanDeleteIconFg: icon {{ "emoji/emoji_delete", stickerPanDeleteFg }};
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 1425f6dd82b77..cc718fae78670 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -189,8 +189,10 @@ StickersListWidget::StickersListWidget(
 , _overBg(st::roundRadiusLarge, st().overBg)
 , _api(&session().mtp())
 , _localSetsManager(std::make_unique<LocalStickersManager>(&session()))
+, _customRecentIds(std::move(descriptor.customRecentList))
 , _section(Section::Stickers)
 , _isMasks(_mode == Mode::Masks)
+, _isEffects(_mode == Mode::MessageEffects)
 , _updateItemsTimer([=] { updateItems(); })
 , _updateSetsTimer([=] { updateSets(); })
 , _trendingAddBgOver(
@@ -220,9 +222,11 @@ StickersListWidget::StickersListWidget(
 , _premiumMark(std::make_unique<StickerPremiumMark>(&session()))
 , _searchRequestTimer([=] { sendSearchRequest(); }) {
 	setMouseTracking(true);
-	setAttribute(Qt::WA_OpaquePaintEvent);
+	if (st().bg->c.alpha() > 0) {
+		setAttribute(Qt::WA_OpaquePaintEvent);
+	}
 
-	if (!_isMasks) {
+	if (!_isMasks && !_isEffects) {
 		setupSearch();
 	}
 
@@ -254,23 +258,30 @@ StickersListWidget::StickersListWidget(
 		refreshStickers();
 	}, lifetime());
 
-	session().data().stickers().recentUpdated(
-		_isMasks ? Data::StickersType::Masks : Data::StickersType::Stickers
-	) | rpl::start_with_next([=] {
-		refreshRecent();
-	}, lifetime());
+	if (!_isEffects) {
+		session().data().stickers().recentUpdated(_isMasks
+			? Data::StickersType::Masks
+			: Data::StickersType::Stickers
+		) | rpl::start_with_next([=] {
+			refreshRecent();
+		}, lifetime());
+	}
 
 	positionValue(
 	) | rpl::skip(1) | rpl::map_to(
 		TabbedSelector::Action::Update
 	) | rpl::start_to_stream(_choosingUpdated, lifetime());
 
-	rpl::merge(
-		Data::AmPremiumValue(&session()) | rpl::to_empty,
-		session().api().premium().cloudSetUpdated()
-	) | rpl::start_with_next([=] {
+	if (_isEffects) {
 		refreshStickers();
-	}, lifetime());
+	} else {
+		rpl::merge(
+			Data::AmPremiumValue(&session()) | rpl::to_empty,
+			session().api().premium().cloudSetUpdated()
+		) | rpl::start_with_next([=] {
+			refreshStickers();
+		}, lifetime());
+	}
 }
 
 rpl::producer<FileChosen> StickersListWidget::chosen() const {
@@ -498,11 +509,14 @@ StickersListWidget::SectionInfo StickersListWidget::sectionInfoByOffset(int yOff
 }
 
 int StickersListWidget::countDesiredHeight(int newWidth) {
-	if (newWidth <= st::stickerPanWidthMin) {
+	const auto minSize = _isEffects
+		? st::stickerEffectWidthMin
+		: st::stickerPanWidthMin;
+	if (newWidth < 2 * minSize) {
 		return 0;
 	}
 	auto availableWidth = newWidth - (st::stickerPanPadding - st().margin.left());
-	auto columnCount = availableWidth / st::stickerPanWidthMin;
+	auto columnCount = availableWidth / minSize;
 	auto singleWidth = availableWidth / columnCount;
 	auto fullWidth = (st().margin.left() + newWidth + st::emojiScroll.width);
 	auto rowsRight = (fullWidth - columnCount * singleWidth) / 2;
@@ -872,7 +886,9 @@ QRect StickersListWidget::stickerRect(int section, int sel) {
 void StickersListWidget::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	auto clip = e->rect();
-	p.fillRect(clip, st().bg);
+	if (st().bg->c.alpha() > 0) {
+		p.fillRect(clip, st().bg);
+	}
 
 	paintStickers(p, clip);
 }
@@ -1459,7 +1475,21 @@ void StickersListWidget::paintSticker(
 		p.setOpacity(1.);
 	}
 
-	if (premium) {
+	auto cornerPainted = false;
+	if (set.id == Data::Stickers::RecentSetId && !_cornerEmoji.empty()) {
+		Assert(index < _cornerEmoji.size());
+		if (const auto emoji = _cornerEmoji[index]) {
+			const auto size = Ui::Emoji::GetSizeNormal();
+			const auto ratio = style::DevicePixelRatio();
+			const auto radius = st::roundRadiusSmall;
+			const auto position = pos
+				+ QPoint(_singleSize.width(), _singleSize.height())
+				- QPoint(size / ratio + radius, size / ratio + radius);
+			Ui::Emoji::Draw(p, emoji, size, position.x(), position.y());
+			cornerPainted = true;
+		}
+	}
+	if (!cornerPainted && premium) {
 		_premiumMark->paint(
 			p,
 			lottieFrame,
@@ -1928,10 +1958,13 @@ void StickersListWidget::clearHeavyData() {
 void StickersListWidget::refreshStickers() {
 	clearSelection();
 
-	refreshMySets();
-	refreshFeaturedSets();
-	refreshSearchSets();
-
+	if (_isEffects) {
+		refreshEffects();
+	} else {
+		refreshMySets();
+		refreshFeaturedSets();
+		refreshSearchSets();
+	}
 	resizeToWidth(width());
 
 	if (_footer) {
@@ -1946,6 +1979,13 @@ void StickersListWidget::refreshStickers() {
 	visibleTopBottomUpdated(getVisibleTop(), getVisibleBottom());
 }
 
+void StickersListWidget::refreshEffects() {
+	auto wasSets = base::take(_mySets);
+	_mySets.reserve(1);
+	refreshRecentStickers(false);
+	takeHeavyData(_mySets, wasSets);
+}
+
 void StickersListWidget::refreshMySets() {
 	auto wasSets = base::take(_mySets);
 	_favedStickersMap.clear();
@@ -2107,7 +2147,27 @@ void StickersListWidget::refreshRecent() {
 	}
 }
 
+auto StickersListWidget::collectCustomRecents() -> std::vector<Sticker> {
+	_custom.clear();
+	_cornerEmoji.clear();
+	auto result = std::vector<Sticker>();
+
+	result.reserve(_customRecentIds.size());
+	const auto owner = &session().data();
+	for (const auto &descriptor : _customRecentIds) {
+		if (const auto document = descriptor.document; document->sticker()) {
+			result.push_back(Sticker{ document });
+			_custom.push_back(false);
+			_cornerEmoji.push_back(Ui::Emoji::Find(descriptor.cornerEmoji));
+		}
+	}
+	return result;
+}
+
 auto StickersListWidget::collectRecentStickers() -> std::vector<Sticker> {
+	if (_isEffects) {
+		return collectCustomRecents();
+	}
 	_custom.clear();
 	auto result = std::vector<Sticker>();
 
@@ -2435,7 +2495,9 @@ bool StickersListWidget::setHasTitle(const Set &set) const {
 		return false;
 	} else if (set.id == Data::Stickers::RecentSetId) {
 		return !_mySets.empty()
-			&& (_isMasks || (_mySets[0].id == Data::Stickers::FavedSetId));
+			&& (_isMasks
+				|| _isEffects
+				|| (_mySets[0].id == Data::Stickers::FavedSetId));
 	}
 	return true;
 }
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index 34838b3649cfb..8dca5601e4033 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -66,12 +66,19 @@ enum class StickersListMode {
 	Masks,
 	UserpicBuilder,
 	ChatIntro,
+	MessageEffects,
+};
+
+struct StickerCustomRecentDescriptor {
+	not_null<DocumentData*> document;
+	QString cornerEmoji;
 };
 
 struct StickersListDescriptor {
 	std::shared_ptr<Show> show;
 	StickersListMode mode = StickersListMode::Full;
 	Fn<bool()> paused;
+	std::vector<StickerCustomRecentDescriptor> customRecentList;
 	const style::EmojiPan *st = nullptr;
 	ComposeFeatures features;
 };
@@ -239,8 +246,10 @@ class StickersListWidget final : public TabbedSelector::Inner {
 
 	bool setHasTitle(const Set &set) const;
 	bool stickerHasDeleteButton(const Set &set, int index) const;
-	std::vector<Sticker> collectRecentStickers();
+	[[nodiscard]] std::vector<Sticker> collectRecentStickers();
+	[[nodiscard]] std::vector<Sticker> collectCustomRecents();
 	void refreshRecentStickers(bool resize = true);
+	void refreshEffects();
 	void refreshFavedStickers();
 	enum class GroupStickersPlace {
 		Visible,
@@ -364,11 +373,13 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	std::unique_ptr<LocalStickersManager> _localSetsManager;
 	ChannelData *_megagroupSet = nullptr;
 	uint64 _megagroupSetIdRequested = 0;
+	std::vector<StickerCustomRecentDescriptor> _customRecentIds;
 	std::vector<Set> _mySets;
 	std::vector<Set> _officialSets;
 	std::vector<Set> _searchSets;
 	int _featuredSetsCount = 0;
 	std::vector<bool> _custom;
+	std::vector<EmojiPtr> _cornerEmoji;
 	base::flat_set<not_null<DocumentData*>> _favedStickersMap;
 	std::weak_ptr<Lottie::FrameRenderer> _lottieRenderer;
 
@@ -381,6 +392,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 
 	Section _section = Section::Stickers;
 	const bool _isMasks;
+	const bool _isEffects;
 
 	base::Timer _updateItemsTimer;
 	base::Timer _updateSetsTimer;
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index cdab73fb6fb6e..78baff83e859e 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -249,6 +249,9 @@ PossibleItemReactions::PossibleItemReactions(
 : recent(other.recent | ranges::views::transform([](const auto &value) {
 	return *value;
 }) | ranges::to_vector)
+, stickers(other.stickers | ranges::views::transform([](const auto &value) {
+	return *value;
+}) | ranges::to_vector)
 , customAllowed(other.customAllowed)
 , tags(other.tags){
 }
diff --git a/Telegram/SourceFiles/data/data_message_reactions.h b/Telegram/SourceFiles/data/data_message_reactions.h
index a1254a6d7bd8b..98aab8d851821 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.h
+++ b/Telegram/SourceFiles/data/data_message_reactions.h
@@ -43,6 +43,7 @@ struct Reaction {
 
 struct PossibleItemReactionsRef {
 	std::vector<not_null<const Reaction*>> recent;
+	std::vector<not_null<const Reaction*>> stickers;
 	bool customAllowed = false;
 	bool tags = false;
 };
@@ -52,6 +53,7 @@ struct PossibleItemReactions {
 	explicit PossibleItemReactions(const PossibleItemReactionsRef &other);
 
 	std::vector<Reaction> recent;
+	std::vector<Reaction> stickers;
 	bool customAllowed = false;
 	bool tags = false;
 };
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index 9ab46ef1409c3..506e05d13b1bd 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/shadow.h"
+#include "ui/wrap/vertical_layout.h"
 #include "ui/text/text_custom_emoji.h"
 #include "ui/text/text_utilities.h"
 #include "ui/platform/ui_platform_utility.h"
@@ -26,6 +27,7 @@ For license and copyright information please follow this link:
 #include "menu/menu_send.h"
 #include "chat_helpers/emoji_list_widget.h"
 #include "chat_helpers/stickers_list_footer.h"
+#include "chat_helpers/stickers_list_widget.h"
 #include "window/window_session_controller.h"
 #include "boxes/premium_preview_box.h"
 #include "mainwidget.h"
@@ -217,6 +219,7 @@ Selector::Selector(
 	child) {
 }
 
+#if 0 // not ready
 Selector::Selector(
 	not_null<QWidget*> parent,
 	const style::EmojiPan &st,
@@ -237,6 +240,7 @@ Selector::Selector(
 	close,
 	child) {
 }
+#endif
 
 Selector::Selector(
 	not_null<QWidget*> parent,
@@ -931,8 +935,10 @@ void Selector::createList() {
 	if (!_reactions.customAllowed) {
 		st->bg = st::transparent;
 	}
-	_list = _scroll->setOwnedWidget(
-		object_ptr<EmojiListWidget>(_scroll, EmojiListDescriptor{
+	auto lists = _scroll->setOwnedWidget(
+		object_ptr<Ui::VerticalLayout>(_scroll));
+	_list = lists->add(
+		object_ptr<EmojiListWidget>(lists, EmojiListDescriptor{
 			.show = _show,
 			.mode = _listMode,
 			.paused = [] { return false; },
@@ -941,12 +947,35 @@ void Selector::createList() {
 				: _recent),
 			.customRecentFactory = _unifiedFactoryOwner->factory(),
 			.st = st,
-		})
-	).data();
+		}));
+	if (!_reactions.stickers.empty()) {
+		auto descriptors = ranges::views::all(
+			_reactions.stickers
+		) | ranges::view::transform([](const Data::Reaction &reaction) {
+			return ChatHelpers::StickerCustomRecentDescriptor{
+				reaction.selectAnimation,
+				reaction.title
+			};
+		}) | ranges::to_vector;
+		_stickers = lists->add(
+			object_ptr<StickersListWidget>(
+				lists,
+				StickersListDescriptor{
+					.show = _show,
+					.mode = StickersListMode::MessageEffects,
+					.paused = [] { return false; },
+					.customRecentList = std::move(descriptors),
+					.st = st,
+				}));
+	}
 
 	_list->escapes() | rpl::start_to_stream(_escapes, _list->lifetime());
 
-	_list->customChosen(
+	rpl::merge(
+		_list->customChosen(),
+		(_stickers
+			? _stickers->chosen()
+			: rpl::never<ChatHelpers::FileChosen>())
 	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
 		_chosen.fire({
 			.id = _unifiedFactoryOwner->lookupReactionId(data.document->id),
@@ -986,24 +1015,35 @@ void Selector::createList() {
 		_shadow->show();
 	}
 	const auto geometry = inner.marginsRemoved(_st.margin);
-	_list->move(0, 0);
-	_list->resizeToWidth(geometry.width());
+	lists->move(0, 0);
+	lists->resizeToWidth(geometry.width());
 	_list->refreshEmoji();
-	_list->show();
+	lists->show();
 
 	const auto updateVisibleTopBottom = [=] {
 		const auto scrollTop = _scroll->scrollTop();
 		const auto scrollBottom = scrollTop + _scroll->height();
-		_list->setVisibleTopBottom(scrollTop, scrollBottom);
+		lists->setVisibleTopBottom(scrollTop, scrollBottom);
 	};
 	_scroll->scrollTopChanges(
-	) | rpl::start_with_next(updateVisibleTopBottom, _list->lifetime());
+	) | rpl::start_with_next(updateVisibleTopBottom, lists->lifetime());
 
 	_list->scrollToRequests(
 	) | rpl::start_with_next([=](int y) {
 		_scroll->scrollToY(y);
-		_shadow->update();
+		if (_shadow) {
+			_shadow->update();
+		}
 	}, _list->lifetime());
+	if (_stickers) {
+		_stickers->scrollToRequests(
+		) | rpl::start_with_next([=](int y) {
+			_scroll->scrollToY(_list->height() + y);
+			if (_shadow) {
+				_shadow->update();
+			}
+		}, _stickers->lifetime());
+	}
 
 	_scroll->setGeometry(inner.marginsRemoved({
 		_st.margin.left(),
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
index 06de4e7cd3111..1dc49fb335fce 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -24,6 +24,7 @@ namespace ChatHelpers {
 class Show;
 class TabbedPanel;
 class EmojiListWidget;
+class StickersListWidget;
 class StickersListFooter;
 enum class EmojiListMode;
 } // namespace ChatHelpers
@@ -85,6 +86,7 @@ class Selector final : public Ui::RpWidget {
 		Fn<void(bool fast)> close,
 		IconFactory iconFactory = nullptr,
 		bool child = false);
+#if 0 // not ready
 	Selector(
 		not_null<QWidget*> parent,
 		const style::EmojiPan &st,
@@ -93,6 +95,7 @@ class Selector final : public Ui::RpWidget {
 		std::vector<DocumentId> recent,
 		Fn<void(bool fast)> close,
 		bool child = false);
+#endif
 	~Selector();
 
 	[[nodiscard]] bool useTransparency() const;
@@ -193,6 +196,7 @@ class Selector final : public Ui::RpWidget {
 
 	Ui::ScrollArea *_scroll = nullptr;
 	ChatHelpers::EmojiListWidget *_list = nullptr;
+	ChatHelpers::StickersListWidget *_stickers = nullptr;
 	ChatHelpers::StickersListFooter *_footer = nullptr;
 	std::unique_ptr<UnifiedFactoryOwner> _unifiedFactoryOwner;
 	Ui::PlainShadow *_shadow = nullptr;
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index f04662997254b..3cfc57d0b66a1 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -169,10 +169,15 @@ void BottomRounded::paintEvent(QPaintEvent *e) {
 	const auto premiumPossible = session->premiumPossible();
 	auto added = base::flat_set<Data::ReactionId>();
 	result.recent.reserve(effects.size());
+	result.stickers.reserve(effects.size());
 	for (const auto &reaction : effects) {
 		if (premiumPossible || !reaction.premium) {
 			if (added.emplace(reaction.id).second) {
-				result.recent.push_back(&reaction);
+				if (reaction.aroundAnimation) {
+					result.recent.push_back(&reaction);
+				} else {
+					result.stickers.push_back(&reaction);
+				}
 			}
 		}
 	}

From b01244fc42876a1118dc44ee5a25b0885ec58a26 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 13 May 2024 12:31:23 +0400
Subject: [PATCH 179/400] Show correct sticker effects title.

---
 Telegram/Resources/langs/lang.strings                      | 2 +-
 Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 968b7f911ad6f..108fb7d39cbfa 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -562,7 +562,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_reaction_gif" = "{reaction} to your GIF";
 
 "lng_effect_add_title" = "Add an animated effect";
-"lng_effect_stickers_title" = "Message Effects";
+"lng_effect_stickers_title" = "Effects from stickers";
 "lng_effect_send" = "Send with Effect";
 
 "lng_languages" = "Languages";
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index cc718fae78670..c2ef3f7f2a93a 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -2239,7 +2239,9 @@ void StickersListWidget::refreshRecentStickers(bool performResize) {
 			Data::Stickers::RecentSetId,
 			nullptr,
 			(SetFlag::Official | SetFlag::Special),
-			tr::lng_recent_stickers(tr::now),
+			(_isEffects
+				? tr::lng_effect_stickers_title(tr::now)
+				: tr::lng_recent_stickers(tr::now)),
 			shortName,
 			recentPack.size(),
 			externalLayout,

From d0d1ef9e66b9d60008732e8e2d82e079be1a0a86 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 13 May 2024 12:39:31 +0400
Subject: [PATCH 180/400] Fix effect panel jump on expand.

---
 .../view/reactions/history_view_reactions_selector.cpp        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index 506e05d13b1bd..c8a1a898220f4 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -400,9 +400,7 @@ void Selector::initGeometry(int innerTop) {
 	_collapsedTopSkip = _useTransparency
 		? (extendTopForCategoriesAndAbout(forAbout) + _specialExpandTopSkip)
 		: 0;
-	_topAddOnExpand = extendTopForCategories()
-		- _aboutExtend
-		+ _specialExpandTopSkip;
+	_topAddOnExpand = _collapsedTopSkip - _aboutExtend;
 	const auto height = margins.top()
 		+ _aboutExtend
 		+ innerHeight

From bbb3a51b74f1e7d1d5f9f28d57a1f01ca99d29d3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 13 May 2024 14:28:51 +0400
Subject: [PATCH 181/400] Fix effect selector for !_useTransparency case.

---
 .../chat_helpers/chat_helpers.style           |  2 +-
 .../history_view_reactions_selector.cpp       | 91 ++++++++++++++++---
 .../history_view_reactions_selector.h         |  7 ++
 .../media/stories/media_stories_reactions.cpp |  4 +-
 4 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 538c247b96dd5..953232da9c104 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -670,7 +670,7 @@ defaultEmojiPan: EmojiPan {
 	boxLabel: boxLabel;
 	icons: defaultComposeIcons;
 	about: defaultEmojiPanAbout;
-	aboutPadding: margins(12px, 2px, 12px, 2px);
+	aboutPadding: margins(12px, 3px, 12px, 2px);
 	autocompleteBottomSkip: 0px;
 }
 statusEmojiPan: EmojiPan(defaultEmojiPan) {
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index c8a1a898220f4..70b987edaac20 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -377,6 +377,32 @@ int Selector::extendTopForCategoriesAndAbout(int width) const {
 	return std::max(extendTopForCategories(), _aboutExtend);
 }
 
+int Selector::opaqueExtendTopAbout(int width) const {
+	if (_about) {
+		const auto padding = _st.aboutPadding;
+		const auto available = width - padding.left() - padding.right();
+		const auto countAboutHeight = [&](int width) {
+			_about->resizeToWidth(width);
+			return _about->height();
+		};
+		const auto desired = Ui::FindNiceTooltipWidth(
+			std::min(available, _st.about.minWidth * 2),
+			available,
+			countAboutHeight);
+
+		_about->resizeToWidth(desired);
+		_aboutExtend = padding.top() + _about->height() + padding.bottom();
+	} else {
+		_aboutExtend = 0;
+	}
+	return _aboutExtend;
+}
+
+void Selector::setOpaqueHeightExpand(int expand, Fn<void(int)> apply) {
+	_opaqueHeightExpand = expand;
+	_opaqueApplyHeightExpand = std::move(apply);
+}
+
 int Selector::minimalHeight() const {
 	return _skipy
 		+ std::min(_recentRows * _size, st::emojiPanMinHeight)
@@ -399,15 +425,19 @@ void Selector::initGeometry(int innerTop) {
 	const auto forAbout = width - margins.left() - margins.right();
 	_collapsedTopSkip = _useTransparency
 		? (extendTopForCategoriesAndAbout(forAbout) + _specialExpandTopSkip)
-		: 0;
+		: opaqueExtendTopAbout(forAbout);
 	_topAddOnExpand = _collapsedTopSkip - _aboutExtend;
 	const auto height = margins.top()
 		+ _aboutExtend
 		+ innerHeight
 		+ margins.bottom();
 	const auto left = style::RightToLeft() ? 0 : (parent.width() - width);
-	const auto top = innerTop - margins.top() - _collapsedTopSkip;
-	const auto add = _st.icons.stripBubble.height() - margins.bottom();
+	const auto top = innerTop
+		- margins.top()
+		- (_useTransparency ? _collapsedTopSkip : 0);
+	const auto add = _useTransparency
+		? (_st.icons.stripBubble.height() - margins.bottom())
+		: 0;
 	_outer = QRect(0, _collapsedTopSkip - _aboutExtend, width, height);
 	_outerWithBubble = _outer.marginsAdded({ 0, 0, 0, add });
 	setGeometry(_outerWithBubble.marginsAdded(
@@ -568,7 +598,7 @@ void Selector::paintCollapsed(QPainter &p) {
 		}
 		p.drawImage(_outer.topLeft(), _paintBuffer);
 	} else {
-		p.fillRect(_inner, _st.bg);
+		p.fillRect(_outer.marginsRemoved(marginsForShadow()), _st.bg);
 	}
 	_strip->paint(
 		p,
@@ -647,6 +677,13 @@ Selector::ExpandingRects Selector::updateExpandingRects(float64 progress) {
 		? int(base::SafeRound(
 			radius - sqrt(categories * (2 * radius - categories))))
 		: 0;
+
+	if (!_useTransparency && _opaqueApplyHeightExpand) {
+		Ui::PostponeCall(this, [=] {
+			_opaqueApplyHeightExpand(y() + outer.y() + outer.height());
+		});
+	}
+
 	return {
 		.categories = QRect(inner.x(), inner.y(), inner.width(), categories),
 		.list = list,
@@ -877,8 +914,9 @@ void Selector::expand() {
 	const auto heightLimit = _reactions.customAllowed
 		? st::emojiPanMaxHeight
 		: minimalHeight();
+	const auto opaqueAdded = _useTransparency ? 0 : _opaqueHeightExpand;
 	const auto willBeHeight = std::min(
-		parent.height() - y(),
+		parent.height() - y() + opaqueAdded,
 		margins.top() + heightLimit + margins.bottom());
 	const auto additionalBottom = willBeHeight - height();
 	const auto additional = _specialExpandTopSkip + additionalBottom;
@@ -903,7 +941,9 @@ void Selector::expand() {
 		}
 		_expanded = true;
 		_paintBuffer = _cachedRound.PrepareImage(size());
-		_expanding.start([=] { update(); }, 0., full, full);
+		_expanding.start([=] {
+			update();
+		}, 0., full, full);
 	});
 }
 
@@ -923,7 +963,9 @@ void Selector::createList() {
 		&_show->session(),
 		_strip ? _reactions.recent : std::vector<Data::Reaction>(),
 		_strip.get());
-	_scroll = Ui::CreateChild<Ui::ScrollArea>(this, _reactions.customAllowed
+	_scroll = Ui::CreateChild<Ui::ScrollArea>(this, !_useTransparency
+		? st::emojiScroll
+		: _reactions.customAllowed
 		? st::reactPanelScroll
 		: st::reactPanelScrollRounded);
 	_scroll->hide();
@@ -1069,7 +1111,7 @@ bool AdjustMenuGeometryForSelector(
 	const auto margins = selector->marginsForShadow();
 	const auto categoriesAboutTop = selector->useTransparency()
 		? selector->extendTopForCategoriesAndAbout(width)
-		: 0;
+		: selector->opaqueExtendTopAbout(width);
 	menu->setForceWidth(width - added);
 	const auto height = menu->height();
 	const auto fullTop = margins.top() + categoriesAboutTop + extend.top();
@@ -1082,9 +1124,7 @@ bool AdjustMenuGeometryForSelector(
 	const auto additionalPaddingBottom
 		= (willBeHeightWithoutBottomPadding >= minimalHeight
 			? 0
-			: useTransparency
-			? (minimalHeight - willBeHeightWithoutBottomPadding)
-			: 0);
+			: (minimalHeight - willBeHeightWithoutBottomPadding));
 	menu->setAdditionalMenuPadding(QMargins(
 		margins.left() + extend.left(),
 		fullTop,
@@ -1100,9 +1140,32 @@ bool AdjustMenuGeometryForSelector(
 		return false;
 	}
 	const auto origin = menu->preparedOrigin();
-	if (!additionalPaddingBottom
-		|| origin == Ui::PanelAnimation::Origin::TopLeft
-		|| origin == Ui::PanelAnimation::Origin::TopRight) {
+	const auto expandDown = (origin == Ui::PanelAnimation::Origin::TopLeft)
+		|| (origin == Ui::PanelAnimation::Origin::TopRight);
+	if (!useTransparency) {
+		const auto expandBy = additionalPaddingBottom;
+		selector->setOpaqueHeightExpand(expandBy, [=](int bottom) {
+			const auto add = bottom - menu->height();
+			if (add > 0) {
+				const auto updated = menu->geometry().marginsAdded({
+					0, expandDown ? 0 : add, 0, expandDown ? add : 0 });
+				menu->setFixedSize(updated.size());
+				menu->setGeometry(updated);
+			}
+		});
+		menu->setAdditionalMenuPadding(QMargins(
+			margins.left() + extend.left(),
+			fullTop,
+			margins.right() + extend.right(),
+			0
+		), QMargins(
+			margins.left(),
+			margins.top(),
+			margins.right(),
+			0
+		));
+		return menu->prepareGeometryFor(desiredPosition);
+	} else if (!additionalPaddingBottom || expandDown) {
 		return true;
 	}
 	menu->setAdditionalMenuPadding(QMargins(
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
index 1dc49fb335fce..ad173385d37ff 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -104,12 +104,15 @@ class Selector final : public Ui::RpWidget {
 	[[nodiscard]] QMargins marginsForShadow() const;
 	[[nodiscard]] int extendTopForCategories() const;
 	[[nodiscard]] int extendTopForCategoriesAndAbout(int width) const;
+	[[nodiscard]] int opaqueExtendTopAbout(int width) const;
 	[[nodiscard]] int minimalHeight() const;
 	[[nodiscard]] int countAppearedWidth(float64 progress) const;
 	void setSpecialExpandTopSkip(int skip);
 	void initGeometry(int innerTop);
 	void beforeDestroy();
 
+	void setOpaqueHeightExpand(int expand, Fn<void(int)> apply);
+
 	[[nodiscard]] rpl::producer<ChosenReaction> chosen() const {
 		return _chosen.events();
 	}
@@ -216,6 +219,10 @@ class Selector final : public Ui::RpWidget {
 	int _specialExpandTopSkip = 0;
 	int _collapsedTopSkip = 0;
 	int _topAddOnExpand = 0;
+
+	int _opaqueHeightExpand = 0;
+	Fn<void(int)> _opaqueApplyHeightExpand;
+
 	const int _size = 0;
 	int _recentRows = 0;
 	int _columns = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index 724533e58a81c..30055ad0b7aaf 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -667,7 +667,9 @@ void Reactions::Panel::create() {
 		TextWithEntities{ (mode == Mode::Message
 			? tr::lng_stories_reaction_as_message(tr::now)
 			: QString()) },
-		[=](bool fast) { hide(mode); });
+		[=](bool fast) { hide(mode); },
+		nullptr,
+		true);
 
 	_selector->chosen(
 	) | rpl::start_with_next([=](

From d102d256a9ae9782ae1ae84a84359be585094c19 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 13 May 2024 15:00:46 +0400
Subject: [PATCH 182/400] Implement effects search.

---
 .../chat_helpers/emoji_list_widget.cpp        |  10 +-
 .../chat_helpers/emoji_list_widget.h          |   4 +
 .../chat_helpers/stickers_list_widget.cpp     | 108 ++++++++++++------
 .../chat_helpers/stickers_list_widget.h       |  16 ++-
 .../chat_helpers/tabbed_selector.cpp          |   4 +-
 .../chat_helpers/tabbed_selector.h            |   2 +-
 .../history_view_reactions_selector.cpp       |  25 ++--
 7 files changed, 115 insertions(+), 54 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 8482d8b8142d0..4962a42a927d3 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -583,9 +583,14 @@ void EmojiListWidget::setupSearch() {
 		InvokeQueued(this, [=] {
 			applyNextSearchQuery();
 		});
+		_searchQueries.fire_copy(_nextSearchQuery);
 	}, session, type);
 }
 
+rpl::producer<std::vector<QString>> EmojiListWidget::searchQueries() const {
+	return _searchQueries.events();
+}
+
 void EmojiListWidget::applyNextSearchQuery() {
 	if (_searchQuery == _nextSearchQuery) {
 		return;
@@ -834,7 +839,8 @@ void EmojiListWidget::unloadCustomIn(const SectionInfo &info) {
 object_ptr<TabbedSelector::InnerFooter> EmojiListWidget::createFooter() {
 	Expects(_footer == nullptr);
 
-	if (_mode == EmojiListMode::RecentReactions) {
+	if (_mode == EmojiListMode::RecentReactions
+		|| _mode == EmojiListMode::MessageEffects) {
 		return { nullptr };
 	}
 
@@ -2131,7 +2137,7 @@ void EmojiListWidget::refreshRecent() {
 }
 
 void EmojiListWidget::refreshCustom() {
-	if (_mode == Mode::RecentReactions) {
+	if (_mode == Mode::RecentReactions || _mode == Mode::MessageEffects) {
 		return;
 	}
 	auto old = base::take(_custom);
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index 219add05bd175..59bfbfce61002 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -77,6 +77,7 @@ enum class EmojiListMode {
 	UserpicBuilder,
 	BackgroundEmoji,
 	PeerTitle,
+	MessageEffects,
 };
 
 struct EmojiListDescriptor {
@@ -146,6 +147,8 @@ class EmojiListWidget final
 	base::unique_qptr<Ui::PopupMenu> fillContextMenu(
 		const SendMenu::Details &details) override;
 
+	[[nodiscard]] rpl::producer<std::vector<QString>> searchQueries() const;
+
 protected:
 	void visibleTopBottomUpdated(
 		int visibleTop,
@@ -418,6 +421,7 @@ class EmojiListWidget final
 	bool _colorAllRippleForced = false;
 	rpl::lifetime _colorAllRippleForcedLifetime;
 
+	rpl::event_stream<std::vector<QString>> _searchQueries;
 	std::vector<QString> _nextSearchQuery;
 	std::vector<QString> _searchQuery;
 	base::flat_set<EmojiPtr> _searchEmoji;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index c2ef3f7f2a93a..0c46508e6556a 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -547,7 +547,7 @@ int StickersListWidget::countDesiredHeight(int newWidth) {
 }
 
 void StickersListWidget::sendSearchRequest() {
-	if (_searchRequestId || _searchNextQuery.isEmpty()) {
+	if (_searchRequestId || _searchNextQuery.isEmpty() || _isEffects) {
 		return;
 	}
 
@@ -556,14 +556,12 @@ void StickersListWidget::sendSearchRequest() {
 
 	auto it = _searchCache.find(_searchQuery);
 	if (it != _searchCache.cend()) {
-		_search->setLoading(false);
+		toggleSearchLoading(false);
 		return;
 	}
-
-	_search->setLoading(true);
-
+	toggleSearchLoading(true);
 	if (_searchQuery == Ui::PremiumGroupFakeEmoticon()) {
-		_search->setLoading(false);
+		toggleSearchLoading(false);
 		_searchRequestId = 0;
 		_searchCache.emplace(_searchQuery, std::vector<uint64>());
 		showSearchResults();
@@ -579,7 +577,7 @@ void StickersListWidget::sendSearchRequest() {
 		searchResultsDone(result);
 	}).fail([=] {
 		// show error?
-		_search->setLoading(false);
+		toggleSearchLoading(false);
 		_searchRequestId = 0;
 	}).handleAllErrors().send();
 }
@@ -593,7 +591,10 @@ void StickersListWidget::searchForSets(
 		return;
 	}
 
-	if (query == Ui::PremiumGroupFakeEmoticon()) {
+	_filterStickersCornerEmoji.clear();
+	if (_isEffects) {
+		filterEffectsByEmoji(std::move(emoji));
+	} else if (query == Ui::PremiumGroupFakeEmoticon()) {
 		_filteredStickers = session().data().stickers().getPremiumList(0);
 	} else {
 		_filteredStickers = session().data().stickers().getListByEmoji(
@@ -602,7 +603,7 @@ void StickersListWidget::searchForSets(
 			true);
 	}
 	if (_searchQuery != cleaned) {
-		_search->setLoading(false);
+		toggleSearchLoading(false);
 		if (const auto requestId = base::take(_searchRequestId)) {
 			_api.request(requestId).cancel();
 		}
@@ -618,13 +619,14 @@ void StickersListWidget::searchForSets(
 }
 
 void StickersListWidget::cancelSetsSearch() {
-	_search->setLoading(false);
+	toggleSearchLoading(false);
 	if (const auto requestId = base::take(_searchRequestId)) {
 		_api.request(requestId).cancel();
 	}
 	_searchRequestTimer.cancel();
 	_searchQuery = _searchNextQuery = QString();
 	_filteredStickers.clear();
+	_filterStickersCornerEmoji.clear();
 	_searchCache.clear();
 	refreshSearchRows(nullptr);
 }
@@ -655,8 +657,9 @@ void StickersListWidget::refreshSearchRows(
 	});
 
 	fillFilteredStickersRow();
-	fillLocalSearchRows(_searchNextQuery);
-
+	if (!_isEffects) {
+		fillLocalSearchRows(_searchNextQuery);
+	}
 	if (!cloudSets && _searchNextQuery.isEmpty()) {
 		showStickerSet(!_mySets.empty()
 			? _mySets[0].id
@@ -665,11 +668,10 @@ void StickersListWidget::refreshSearchRows(
 	}
 
 	setSection(Section::Search);
-	if (cloudSets) {
+	if (!_isEffects && cloudSets) {
 		fillCloudSearchRows(*cloudSets);
 	}
 	refreshIcons(ValidateIconAnimations::Scroll);
-
 	_lastMousePosition = QCursor::pos();
 
 	resizeToWidth(width());
@@ -735,7 +737,7 @@ void StickersListWidget::fillFilteredStickersRow() {
 		SearchEmojiSectionSetId(),
 		nullptr,
 		Data::StickersSetFlag::Special,
-		QString(), // title
+		_isEffects ? tr::lng_effect_stickers_title(tr::now) : QString(),
 		QString(), // shortName
 		_filteredStickers.size(),
 		false, // externalLayout
@@ -758,6 +760,12 @@ void StickersListWidget::addSearchRow(not_null<StickersSet*> set) {
 		std::move(elements));
 }
 
+void StickersListWidget::toggleSearchLoading(bool loading) {
+	if (_search) {
+		_search->setLoading(loading);
+	}
+}
+
 void StickersListWidget::takeHeavyData(
 		std::vector<Set> &to,
 		std::vector<Set> &from) {
@@ -839,7 +847,7 @@ auto StickersListWidget::shownSets() -> std::vector<Set> & {
 
 void StickersListWidget::searchResultsDone(
 		const MTPmessages_FoundStickerSets &result) {
-	_search->setLoading(false);
+	toggleSearchLoading(false);
 	_searchRequestId = 0;
 
 	if (result.type() == mtpc_messages_foundStickerSetsNotModified) {
@@ -1476,9 +1484,14 @@ void StickersListWidget::paintSticker(
 	}
 
 	auto cornerPainted = false;
-	if (set.id == Data::Stickers::RecentSetId && !_cornerEmoji.empty()) {
-		Assert(index < _cornerEmoji.size());
-		if (const auto emoji = _cornerEmoji[index]) {
+	const auto corner = (set.id == Data::Stickers::RecentSetId)
+		? &_cornerEmoji
+		: (set.id == SearchEmojiSectionSetId())
+		? &_filterStickersCornerEmoji
+		: nullptr;
+	if (corner && !corner->empty()) {
+		Assert(index < corner->size());
+		if (const auto emoji = (*corner)[index]) {
 			const auto size = Ui::Emoji::GetSizeNormal();
 			const auto ratio = style::DevicePixelRatio();
 			const auto radius = st::roundRadiusSmall;
@@ -2492,14 +2505,14 @@ void StickersListWidget::updateSelected() {
 }
 
 bool StickersListWidget::setHasTitle(const Set &set) const {
-	if (set.id == Data::Stickers::FavedSetId
+	if (_isEffects) {
+		return true;
+	} else if (set.id == Data::Stickers::FavedSetId
 		|| set.id == SearchEmojiSectionSetId()) {
 		return false;
 	} else if (set.id == Data::Stickers::RecentSetId) {
 		return !_mySets.empty()
-			&& (_isMasks
-				|| _isEffects
-				|| (_mySets[0].id == Data::Stickers::FavedSetId));
+			&& (_isMasks || (_mySets[0].id == Data::Stickers::FavedSetId));
 	}
 	return true;
 }
@@ -2581,9 +2594,10 @@ void StickersListWidget::showStickerSet(uint64 setId) {
 	const auto guard = gsl::finally([&] { _showingSetById = false; });
 
 	clearSelection();
-	if (_search
-		&& (!_searchQuery.isEmpty() || !_searchNextQuery.isEmpty())) {
-		_search->cancel();
+	if (!_searchQuery.isEmpty() || !_searchNextQuery.isEmpty()) {
+		if (_search) {
+			_search->cancel();
+		}
 		cancelSetsSearch();
 	}
 
@@ -2686,14 +2700,18 @@ void StickersListWidget::setupSearch() {
 		? TabbedSearchType::Greeting
 		: TabbedSearchType::Stickers;
 	_search = MakeSearch(this, st(), [=](std::vector<QString> &&query) {
-		auto set = base::flat_set<EmojiPtr>();
-		auto text = ranges::accumulate(query, QString(), [](
+		applySearchQuery(std::move(query));
+	}, session, type);
+}
+
+void StickersListWidget::applySearchQuery(std::vector<QString> &&query) {
+	auto set = base::flat_set<EmojiPtr>();
+	auto text = ranges::accumulate(query, QString(), [](
 			QString a,
 			QString b) {
-			return a.isEmpty() ? b : (a + ' ' + b);
-		});
-		searchForSets(std::move(text), SearchEmoji(query, set));
-	}, session, type);
+		return a.isEmpty() ? b : (a + ' ' + b);
+	});
+	searchForSets(std::move(text), SearchEmoji(query, set));
 }
 
 void StickersListWidget::displaySet(uint64 setId) {
@@ -2768,6 +2786,32 @@ bool StickersListWidget::mySetsEmpty() const {
 	return _mySets.empty();
 }
 
+void StickersListWidget::filterEffectsByEmoji(
+		const std::vector<EmojiPtr> &emoji) {
+	_filteredStickers.clear();
+	_filterStickersCornerEmoji.clear();
+	if (_mySets.empty()
+		|| _mySets.front().id != Data::Stickers::RecentSetId
+		|| _mySets.front().stickers.empty()) {
+		return;
+	}
+	const auto &list = _mySets.front().stickers;
+	auto all = base::flat_set<EmojiPtr>();
+	for (const auto &one : emoji) {
+		all.emplace(one->original());
+	}
+	const auto count = int(list.size());
+	_filteredStickers.reserve(count);
+	_filterStickersCornerEmoji.reserve(count);
+	for (auto i = 0; i != count; ++i) {
+		Assert(i < _cornerEmoji.size());
+		if (all.contains(_cornerEmoji[i])) {
+			_filteredStickers.push_back(list[i].document);
+			_filterStickersCornerEmoji.push_back(_cornerEmoji[i]);
+		}
+	}
+}
+
 StickersListWidget::~StickersListWidget() = default;
 
 object_ptr<Ui::BoxContent> MakeConfirmRemoveSetBox(
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index 8dca5601e4033..1f1de231b97d1 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -127,6 +127,8 @@ class StickersListWidget final : public TabbedSelector::Inner {
 
 	bool mySetsEmpty() const;
 
+	void applySearchQuery(std::vector<QString> &&query);
+
 	~StickersListWidget();
 
 protected:
@@ -261,12 +263,13 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	void updateSelected();
 	void setSelected(OverState newSelected);
 	void setPressed(OverState newPressed);
-	std::unique_ptr<Ui::RippleAnimation> createButtonRipple(int section);
-	QPoint buttonRippleTopLeft(int section) const;
+	[[nodiscard]] std::unique_ptr<Ui::RippleAnimation> createButtonRipple(
+		int section);
+	[[nodiscard]] QPoint buttonRippleTopLeft(int section) const;
 
-	std::vector<Set> &shownSets();
-	const std::vector<Set> &shownSets() const;
-	int featuredRowHeight() const;
+	[[nodiscard]] std::vector<Set> &shownSets();
+	[[nodiscard]] const std::vector<Set> &shownSets() const;
+	[[nodiscard]] int featuredRowHeight() const;
 	void checkVisibleFeatured(int visibleTop, int visibleBottom);
 	void readVisibleFeatured(int visibleTop, int visibleBottom);
 
@@ -324,6 +327,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 
 	[[nodiscard]] const Data::StickersSetsOrder &defaultSetsOrder() const;
 	[[nodiscard]] Data::StickersSetsOrder &defaultSetsOrderRef();
+	void filterEffectsByEmoji(const std::vector<EmojiPtr> &emoji);
 
 	enum class AppendSkip {
 		None,
@@ -356,6 +360,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	void fillLocalSearchRows(const QString &query);
 	void fillCloudSearchRows(const std::vector<uint64> &cloudSets);
 	void addSearchRow(not_null<Data::StickersSet*> set);
+	void toggleSearchLoading(bool loading);
 
 	void showPreview();
 
@@ -431,6 +436,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	std::unique_ptr<StickerPremiumMark> _premiumMark;
 
 	std::vector<not_null<DocumentData*>> _filteredStickers;
+	std::vector<EmojiPtr> _filterStickersCornerEmoji;
 	std::map<QString, std::vector<uint64>> _searchCache;
 	std::vector<std::pair<uint64, QStringList>> _searchIndex;
 	base::Timer _searchRequestTimer;
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 5e8967541290e..7ac1364213203 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -1460,9 +1460,7 @@ int TabbedSelector::Inner::resizeGetHeight(int newWidth) {
 }
 
 int TabbedSelector::Inner::minimalHeight() const {
-	return (_minimalHeight > 0)
-		? _minimalHeight
-		: defaultMinimalHeight();
+	return _minimalHeight.value_or(defaultMinimalHeight());
 }
 
 int TabbedSelector::Inner::defaultMinimalHeight() const {
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index bb780797ce577..b5355dafc443f 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -422,7 +422,7 @@ class TabbedSelector::Inner : public Ui::RpWidget {
 
 	int _visibleTop = 0;
 	int _visibleBottom = 0;
-	int _minimalHeight = 0;
+	std::optional<int> _minimalHeight;
 
 	rpl::event_stream<int> _scrollToRequests;
 	rpl::event_stream<bool> _disableScrollRequests;
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index 70b987edaac20..2f55b60485d9b 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -211,7 +211,9 @@ Selector::Selector(
 	reactions,
 	(reactions.customAllowed
 		? ChatHelpers::EmojiListMode::FullReactions
-		: ChatHelpers::EmojiListMode::RecentReactions),
+		: reactions.stickers.empty()
+		? ChatHelpers::EmojiListMode::RecentReactions
+		: ChatHelpers::EmojiListMode::MessageEffects),
 	{},
 	std::move(about),
 	iconFactory,
@@ -1075,15 +1077,6 @@ void Selector::createList() {
 			_shadow->update();
 		}
 	}, _list->lifetime());
-	if (_stickers) {
-		_stickers->scrollToRequests(
-		) | rpl::start_with_next([=](int y) {
-			_scroll->scrollToY(_list->height() + y);
-			if (_shadow) {
-				_shadow->update();
-			}
-		}, _stickers->lifetime());
-	}
 
 	_scroll->setGeometry(inner.marginsRemoved({
 		_st.margin.left(),
@@ -1091,7 +1084,17 @@ void Selector::createList() {
 		0,
 		0,
 	}));
-	_list->setMinimalHeight(geometry.width(), _scroll->height());
+	if (_stickers) {
+		_list->setMinimalHeight(geometry.width(), 0);
+		_stickers->setMinimalHeight(geometry.width(), 0);
+
+		_list->searchQueries(
+		) | rpl::start_with_next([=](std::vector<QString> &&query) {
+			_stickers->applySearchQuery(std::move(query));
+		}, _stickers->lifetime());
+	} else {
+		_list->setMinimalHeight(geometry.width(), _scroll->height());
+	}
 
 	updateVisibleTopBottom();
 }

From 732b67ca049557c3b04ad909f46d5f269aeaada3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 May 2024 12:16:39 +0400
Subject: [PATCH 183/400] Implement effects paywalls.

---
 Telegram/Resources/langs/lang.strings         |  3 +
 .../SourceFiles/boxes/sticker_set_box.cpp     | 45 +++++++-----
 Telegram/SourceFiles/boxes/sticker_set_box.h  |  5 +-
 .../chat_helpers/chat_helpers.style           |  1 +
 .../chat_helpers/emoji_list_widget.cpp        | 65 +++++++++++++++--
 .../chat_helpers/emoji_list_widget.h          |  9 +++
 .../chat_helpers/field_autocomplete.cpp       |  2 +-
 .../chat_helpers/stickers_list_widget.cpp     | 24 +++++-
 .../chat_helpers/stickers_list_widget.h       |  3 +
 .../history_view_reactions_selector.cpp       | 48 +++++++++++-
 .../history_view_reactions_selector.h         |  1 +
 Telegram/SourceFiles/menu/menu_send.cpp       | 73 +++++++++++++++----
 Telegram/SourceFiles/ui/chat/chat.style       |  9 +++
 13 files changed, 241 insertions(+), 47 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 108fb7d39cbfa..c0ef61a957eee 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -564,6 +564,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_effect_add_title" = "Add an animated effect";
 "lng_effect_stickers_title" = "Effects from stickers";
 "lng_effect_send" = "Send with Effect";
+"lng_effect_none" = "No effects found.";
+"lng_effect_premium" = "Subscribe to {link} to add this animated effect.";
+"lng_effect_premium_link" = "Telegram Premium";
 
 "lng_languages" = "Languages";
 "lng_languages_none" = "No languages found.";
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index efd034843da2a..b3c589be79305 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -73,7 +73,9 @@ using Data::StickersSet;
 using Data::StickersPack;
 using SetFlag = Data::StickersSetFlag;
 
-[[nodiscard]] std::optional<QColor> ComputeImageColor(const QImage &frame) {
+[[nodiscard]] std::optional<QColor> ComputeImageColor(
+		const style::icon &lockIcon,
+		const QImage &frame) {
 	if (frame.isNull()
 		|| frame.format() != QImage::Format_ARGB32_Premultiplied) {
 		return {};
@@ -83,7 +85,7 @@ using SetFlag = Data::StickersSetFlag;
 	auto sb = int64();
 	auto sa = int64();
 	const auto factor = frame.devicePixelRatio();
-	const auto size = st::stickersPremiumLock.size() * factor;
+	const auto size = lockIcon.size() * factor;
 	const auto width = std::min(frame.width(), size.width());
 	const auto height = std::min(frame.height(), size.height());
 	const auto skipx = (frame.width() - width) / 2;
@@ -110,22 +112,30 @@ using SetFlag = Data::StickersSetFlag;
 
 }
 
-[[nodiscard]] QColor ComputeLockColor(const QImage &frame) {
-	return ComputeImageColor(frame).value_or(st::windowSubTextFg->c);
+[[nodiscard]] QColor ComputeLockColor(
+		const style::icon &lockIcon,
+		const QImage &frame) {
+	return ComputeImageColor(
+		lockIcon,
+		frame
+	).value_or(st::windowSubTextFg->c);
 }
 
-void ValidatePremiumLockBg(QImage &image, const QImage &frame) {
+void ValidatePremiumLockBg(
+		const style::icon &lockIcon,
+		QImage &image,
+		const QImage &frame) {
 	if (!image.isNull()) {
 		return;
 	}
 	const auto factor = style::DevicePixelRatio();
-	const auto size = st::stickersPremiumLock.size();
+	const auto size = lockIcon.size();
 	image = QImage(
 		size * factor,
 		QImage::Format_ARGB32_Premultiplied);
 	image.setDevicePixelRatio(factor);
 	auto p = QPainter(&image);
-	const auto color = ComputeLockColor(frame);
+	const auto color = ComputeLockColor(lockIcon, frame);
 	p.fillRect(
 		QRect(QPoint(), size),
 		anim::color(color, st::windowSubTextFg, kGrayLockOpacity));
@@ -134,12 +144,12 @@ void ValidatePremiumLockBg(QImage &image, const QImage &frame) {
 	image = Images::Circle(std::move(image));
 }
 
-void ValidatePremiumStarFg(QImage &image) {
+void ValidatePremiumStarFg(const style::icon &lockIcon, QImage &image) {
 	if (!image.isNull()) {
 		return;
 	}
 	const auto factor = style::DevicePixelRatio();
-	const auto size = st::stickersPremiumLock.size();
+	const auto size = lockIcon.size();
 	image = QImage(
 		size * factor,
 		QImage::Format_ARGB32_Premultiplied);
@@ -176,7 +186,10 @@ void ValidatePremiumStarFg(QImage &image) {
 
 } // namespace
 
-StickerPremiumMark::StickerPremiumMark(not_null<Main::Session*> session) {
+StickerPremiumMark::StickerPremiumMark(
+	not_null<Main::Session*> session,
+	const style::icon &lockIcon)
+: _lockIcon(lockIcon) {
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
 		_lockGray = QImage();
@@ -202,16 +215,14 @@ void StickerPremiumMark::paint(
 	const auto factor = style::DevicePixelRatio();
 	const auto radius = st::roundRadiusSmall;
 	const auto point = position + QPoint(
-		(_premium
-			? (singleSize.width() - (bg.width() / factor) - radius)
-			: (singleSize.width() - (bg.width() / factor)) / 2),
+		(singleSize.width() - (bg.width() / factor) - radius),
 		singleSize.height() - (bg.height() / factor) - radius);
 	p.drawImage(point, bg);
 	if (_premium) {
 		validateStar();
 		p.drawImage(point, _star);
 	} else {
-		st::stickersPremiumLock.paint(p, point, outerWidth);
+		_lockIcon.paint(p, point, outerWidth);
 	}
 }
 
@@ -219,11 +230,11 @@ void StickerPremiumMark::validateLock(
 		const QImage &frame,
 		QImage &backCache) {
 	auto &image = frame.isNull() ? _lockGray : backCache;
-	ValidatePremiumLockBg(image, frame);
+	ValidatePremiumLockBg(_lockIcon, image, frame);
 }
 
 void StickerPremiumMark::validateStar() {
-	ValidatePremiumStarFg(_star);
+	ValidatePremiumStarFg(_lockIcon, _star);
 }
 
 class StickerSetBox::Inner final : public Ui::RpWidget {
@@ -664,7 +675,7 @@ StickerSetBox::Inner::Inner(
 	st::windowBgRipple,
 	st::windowBgOver,
 	[=] { repaintItems(); }))
-, _premiumMark(_session)
+, _premiumMark(_session, st::stickersPremiumLock)
 , _updateItemsTimer([=] { updateItems(); })
 , _input(set)
 , _padding((type == Data::StickersType::Emoji)
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.h b/Telegram/SourceFiles/boxes/sticker_set_box.h
index 72dd38320a285..e718cc45e1d38 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.h
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.h
@@ -30,7 +30,9 @@ class Show;
 
 class StickerPremiumMark final {
 public:
-	explicit StickerPremiumMark(not_null<Main::Session*> session);
+	StickerPremiumMark(
+		not_null<Main::Session*> session,
+		const style::icon &lockIcon);
 
 	void paint(
 		QPainter &p,
@@ -44,6 +46,7 @@ class StickerPremiumMark final {
 	void validateLock(const QImage &frame, QImage &backCache);
 	void validateStar();
 
+	const style::icon &_lockIcon;
 	QImage _lockGray;
 	QImage _star;
 	bool _premium = false;
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 953232da9c104..d69d4e6bb1c93 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -754,6 +754,7 @@ inlineResultsMinWidth: 48px;
 inlineDurationMargin: 3px;
 
 stickersPremiumLock: icon{{ "emoji/premium_lock", premiumButtonFg }};
+emojiPremiumLock: icon{{ "chat/mini_lock", premiumButtonFg }};
 
 reactStripExtend: margins(21px, 49px, 39px, 0px);
 reactStripHeight: 40px;
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 4962a42a927d3..c91ccf1d14c6e 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -136,6 +136,7 @@ struct EmojiListWidget::CustomEmojiInstance {
 struct EmojiListWidget::RecentOne {
 	Ui::Text::CustomEmoji *custom = nullptr;
 	RecentEmojiId id;
+	mutable QImage premiumLock;
 };
 
 EmojiColorPicker::EmojiColorPicker(
@@ -478,8 +479,12 @@ EmojiListWidget::EmojiListWidget(
 , _localSetsManager(
 	std::make_unique<LocalStickersManager>(&session()))
 , _customRecentFactory(std::move(descriptor.customRecentFactory))
+, _freeEffects(std::move(descriptor.freeEffects))
 , _customTextColor(std::move(descriptor.customTextColor))
 , _overBg(st::emojiPanRadius, st().overBg)
+, _premiumMark(std::make_unique<StickerPremiumMark>(
+	&session(),
+	st::emojiPremiumLock))
 , _collapsedBg(st::emojiPanExpand.height / 2, st().headerFg)
 , _picker(this, st())
 , _showPickerTimer([=] { showPicker(); })
@@ -591,6 +596,10 @@ rpl::producer<std::vector<QString>> EmojiListWidget::searchQueries() const {
 	return _searchQueries.events();
 }
 
+rpl::producer<int> EmojiListWidget::recentShownCount() const {
+	return _recentShownCount.value();
+}
+
 void EmojiListWidget::applyNextSearchQuery() {
 	if (_searchQuery == _nextSearchQuery) {
 		return;
@@ -612,6 +621,9 @@ void EmojiListWidget::applyNextSearchQuery() {
 			_searchCustomIds.clear();
 		}
 		resizeToWidth(width());
+		_recentShownCount = searching
+			? _searchResults.size()
+			: _recent.size();
 		update();
 		if (modeChanged) {
 			visibleTopBottomUpdated(getVisibleTop(), getVisibleBottom());
@@ -1024,9 +1036,10 @@ int EmojiListWidget::countDesiredHeight(int newWidth) {
 	const auto minimalLastHeight = std::max(
 		minimalHeight - padding.bottom(),
 		0);
-	return qMax(
-		minimalHeight,
-		countResult(minimalLastHeight) + padding.bottom());
+	const auto result = countResult(minimalLastHeight);
+	return result
+		? qMax(minimalHeight, result + padding.bottom())
+		: 0;
 }
 
 int EmojiListWidget::defaultMinimalHeight() const {
@@ -1291,6 +1304,8 @@ void EmojiListWidget::paint(
 		QRect clip) {
 	validateEmojiPaintContext(context);
 
+	_paintAsPremium = session().premium();
+
 	auto fromColumn = floorclamp(
 		clip.x() - _rowsLeft,
 		_singleSize.width(),
@@ -1455,16 +1470,44 @@ void EmojiListWidget::drawRecent(
 		QPoint position,
 		const RecentOne &recent) {
 	_recentPainted = true;
+	const auto locked = (_mode == Mode::MessageEffects)
+		&& !_paintAsPremium
+		&& v::is<RecentEmojiDocument>(recent.id.data)
+		&& !_freeEffects.contains(
+			v::get<RecentEmojiDocument>(recent.id.data).id);
+	auto lockedPainted = false;
+	if (locked) {
+		if (_premiumMarkFrameCache.isNull()) {
+			const auto ratio = style::DevicePixelRatio();
+			_premiumMarkFrameCache = QImage(
+				QSize(_customSingleSize, _customSingleSize) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_premiumMarkFrameCache.setDevicePixelRatio(ratio);
+		}
+		_premiumMarkFrameCache.fill(Qt::transparent);
+	}
 	if (const auto custom = recent.custom) {
-		_emojiPaintContext->scale = context.progress;
-		_emojiPaintContext->position = position
+		const auto exactPosition = position
 			+ _innerPosition
 			+ _customPosition;
+		_emojiPaintContext->scale = context.progress;
 		if (_mode == Mode::ChannelStatus) {
 			_emojiPaintContext->internal.forceFirstFrame
 				= (recent.id == _recent.front().id);
 		}
-		custom->paint(p, *_emojiPaintContext);
+		if (locked) {
+			lockedPainted = custom->ready();
+
+			auto q = Painter(&_premiumMarkFrameCache);
+			_emojiPaintContext->position = QPoint();
+			custom->paint(q, *_emojiPaintContext);
+			q.end();
+
+			p.drawImage(exactPosition, _premiumMarkFrameCache);
+		} else {
+			_emojiPaintContext->position = exactPosition;
+			custom->paint(p, *_emojiPaintContext);
+		}
 	} else if (const auto emoji = std::get_if<EmojiPtr>(&recent.id.data)) {
 		if (_mode == Mode::EmojiStatus) {
 			position += QPoint(
@@ -1478,6 +1521,16 @@ void EmojiListWidget::drawRecent(
 	} else {
 		Unexpected("Empty custom emoji in EmojiListWidget::drawRecent.");
 	}
+
+	if (locked) {
+		_premiumMark->paint(
+			p,
+			lockedPainted ? _premiumMarkFrameCache : QImage(),
+			recent.premiumLock,
+			position,
+			_singleSize,
+			width());
+	}
 }
 
 void EmojiListWidget::drawEmoji(
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index 59bfbfce61002..3aef95ac0d0e7 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -13,6 +13,8 @@ For license and copyright information please follow this link:
 #include "ui/round_rect.h"
 #include "base/timer.h"
 
+class StickerPremiumMark;
+
 namespace style {
 struct EmojiPan;
 } // namespace style
@@ -89,6 +91,7 @@ struct EmojiListDescriptor {
 	Fn<std::unique_ptr<Ui::Text::CustomEmoji>(
 		DocumentId,
 		Fn<void()>)> customRecentFactory;
+	base::flat_set<DocumentId> freeEffects;
 	const style::EmojiPan *st = nullptr;
 	ComposeFeatures features;
 };
@@ -148,6 +151,7 @@ class EmojiListWidget final
 		const SendMenu::Details &details) override;
 
 	[[nodiscard]] rpl::producer<std::vector<QString>> searchQueries() const;
+	[[nodiscard]] rpl::producer<int> recentShownCount() const;
 
 protected:
 	void visibleTopBottomUpdated(
@@ -400,10 +404,13 @@ class EmojiListWidget final
 	int _counts[kEmojiSectionCount];
 	std::vector<RecentOne> _recent;
 	base::flat_set<DocumentId> _recentCustomIds;
+	base::flat_set<DocumentId> _freeEffects;
 	base::flat_set<uint64> _repaintsScheduled;
+	rpl::variable<int> _recentShownCount;
 	std::unique_ptr<Ui::Text::CustomEmojiPaintContext> _emojiPaintContext;
 	bool _recentPainted = false;
 	bool _grabbingChosen = false;
+	bool _paintAsPremium = false;
 	QVector<EmojiPtr> _emoji[kEmojiSectionCount];
 	std::vector<CustomSet> _custom;
 	base::flat_set<DocumentId> _restrictedCustomList;
@@ -417,6 +424,8 @@ class EmojiListWidget final
 	Ui::RoundRect _overBg;
 	QImage _searchExpandCache;
 
+	std::unique_ptr<StickerPremiumMark> _premiumMark;
+	QImage _premiumMarkFrameCache;
 	mutable std::unique_ptr<Ui::RippleAnimation> _colorAllRipple;
 	bool _colorAllRippleForced = false;
 	rpl::lifetime _colorAllRippleForcedLifetime;
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 90f11e9788d68..bece81b647eba 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -891,7 +891,7 @@ FieldAutocomplete::Inner::Inner(
 	_st.pathBg,
 	_st.pathFg,
 	[=] { update(); }))
-, _premiumMark(_session)
+, _premiumMark(_session, st::stickersPremiumLock)
 , _previewTimer([=] { showPreview(); }) {
 	_session->downloaderTaskFinished(
 	) | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 0c46508e6556a..bb1278fd8e95a 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -219,7 +219,9 @@ StickersListWidget::StickersListWidget(
 , _installedWidth(st::stickersTrendingInstalled.font->width(_installedText))
 , _settings(this, tr::lng_stickers_you_have(tr::now))
 , _previewTimer([=] { showPreview(); })
-, _premiumMark(std::make_unique<StickerPremiumMark>(&session()))
+, _premiumMark(std::make_unique<StickerPremiumMark>(
+	&session(),
+	st::stickersPremiumLock))
 , _searchRequestTimer([=] { sendSearchRequest(); }) {
 	setMouseTracking(true);
 	if (st().bg->c.alpha() > 0) {
@@ -542,8 +544,8 @@ int StickersListWidget::countDesiredHeight(int newWidth) {
 	const auto minimalLastHeight = (_section == Section::Stickers)
 		? minimalHeight
 		: 0;
-	return qMax(minimalHeight, countResult(minimalLastHeight))
-		+ st::stickerPanPadding;
+	const auto result = qMax(minimalHeight, countResult(minimalLastHeight));
+	return result ? (result + st::stickerPanPadding) : 0;
 }
 
 void StickersListWidget::sendSearchRequest() {
@@ -675,9 +677,14 @@ void StickersListWidget::refreshSearchRows(
 	_lastMousePosition = QCursor::pos();
 
 	resizeToWidth(width());
+	_recentShownCount = _filteredStickers.size();
 	updateSelected();
 }
 
+rpl::producer<int> StickersListWidget::recentShownCount() const {
+	return _recentShownCount.value();
+}
+
 void StickersListWidget::fillLocalSearchRows(const QString &query) {
 	const auto searchWordsList = TextUtilities::PrepareSearchWords(query);
 	if (searchWordsList.isEmpty()) {
@@ -910,6 +917,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 		toColumn = _columnCount - toColumn;
 	}
 
+	_paintAsPremium = session().premium();
 	_pathGradient->startFrame(0, width(), width() / 2);
 
 	auto &sets = shownSets();
@@ -1489,7 +1497,7 @@ void StickersListWidget::paintSticker(
 		: (set.id == SearchEmojiSectionSetId())
 		? &_filterStickersCornerEmoji
 		: nullptr;
-	if (corner && !corner->empty()) {
+	if (corner && !corner->empty() && _paintAsPremium) {
 		Assert(index < corner->size());
 		if (const auto emoji = (*corner)[index]) {
 			const auto size = Ui::Emoji::GetSizeNormal();
@@ -1960,6 +1968,11 @@ void StickersListWidget::setSection(Section section) {
 	}
 	clearHeavyData();
 	_section = section;
+	_recentShownCount = (section == Section::Search)
+		? _filteredStickers.size()
+		: _mySets.empty()
+		? 0
+		: _mySets.front().stickers.size();
 }
 
 void StickersListWidget::clearHeavyData() {
@@ -2242,6 +2255,9 @@ void StickersListWidget::refreshRecentStickers(bool performResize) {
 	clearSelection();
 
 	auto recentPack = collectRecentStickers();
+	if (_section == Section::Stickers) {
+		_recentShownCount = recentPack.size();
+	}
 	auto recentIt = std::find_if(_mySets.begin(), _mySets.end(), [](auto &set) {
 		return set.id == Data::Stickers::RecentSetId;
 	});
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index 1f1de231b97d1..f1a89b21081be 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -128,6 +128,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	bool mySetsEmpty() const;
 
 	void applySearchQuery(std::vector<QString> &&query);
+	[[nodiscard]] rpl::producer<int> recentShownCount() const;
 
 	~StickersListWidget();
 
@@ -388,6 +389,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	base::flat_set<not_null<DocumentData*>> _favedStickersMap;
 	std::weak_ptr<Lottie::FrameRenderer> _lottieRenderer;
 
+	bool _paintAsPremium = false;
 	bool _showingSetById = false;
 	crl::time _lastScrolledAt = 0;
 	crl::time _lastFullUpdatedAt = 0;
@@ -437,6 +439,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 
 	std::vector<not_null<DocumentData*>> _filteredStickers;
 	std::vector<EmojiPtr> _filterStickersCornerEmoji;
+	rpl::variable<int> _recentShownCount;
 	std::map<QString, std::vector<uint64>> _searchCache;
 	std::vector<std::pair<uint64, QStringList>> _searchIndex;
 	base::Timer _searchRequestTimer;
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index 2f55b60485d9b..7173d3aed45dd 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -972,6 +972,7 @@ void Selector::createList() {
 		: st::reactPanelScrollRounded);
 	_scroll->hide();
 
+	const auto effects = !_reactions.stickers.empty();
 	const auto st = lifetime().make_state<style::EmojiPan>(_st);
 	st->padding.setTop(_skipy);
 	if (!_reactions.customAllowed) {
@@ -979,15 +980,35 @@ void Selector::createList() {
 	}
 	auto lists = _scroll->setOwnedWidget(
 		object_ptr<Ui::VerticalLayout>(_scroll));
+	auto recentList = _strip
+		? _unifiedFactoryOwner->unifiedIdsList()
+		: _recent;
+	auto freeEffects = base::flat_set<DocumentId>();
+	if (effects) {
+		auto free = base::flat_set<Data::ReactionId>();
+		free.reserve(_reactions.recent.size());
+		for (const auto &reaction : _reactions.recent) {
+			if (!reaction.premium) {
+				free.emplace(reaction.id);
+			}
+		}
+		for (const auto &id : recentList) {
+			const auto reactionId = _strip
+				? _unifiedFactoryOwner->lookupReactionId(id)
+				: Data::ReactionId{ id };
+			if (free.contains(reactionId)) {
+				freeEffects.insert(id);
+			}
+		}
+	}
 	_list = lists->add(
 		object_ptr<EmojiListWidget>(lists, EmojiListDescriptor{
 			.show = _show,
 			.mode = _listMode,
 			.paused = [] { return false; },
-			.customRecentList = (_strip
-				? _unifiedFactoryOwner->unifiedIdsList()
-				: _recent),
+			.customRecentList = std::move(recentList),
 			.customRecentFactory = _unifiedFactoryOwner->factory(),
+			.freeEffects = std::move(freeEffects),
 			.st = st,
 		}));
 	if (!_reactions.stickers.empty()) {
@@ -1092,6 +1113,27 @@ void Selector::createList() {
 		) | rpl::start_with_next([=](std::vector<QString> &&query) {
 			_stickers->applySearchQuery(std::move(query));
 		}, _stickers->lifetime());
+
+
+		rpl::combine(
+			_list->recentShownCount(),
+			_stickers->recentShownCount()
+		) | rpl::start_with_next([=](int emoji, int stickers) {
+			_showEmptySearch = !emoji && !stickers;
+			_scroll->update();
+		}, _scroll->lifetime());
+
+		_scroll->paintRequest() | rpl::filter([=] {
+			return _showEmptySearch;
+		}) | rpl::start_with_next([=] {
+			auto p = QPainter(_scroll);
+			p.setPen(st::windowSubTextFg);
+			p.setFont(st::normalFont);
+			p.drawText(
+				_scroll->rect(),
+				tr::lng_effect_none(tr::now),
+				style::al_center);
+		}, _scroll->lifetime());
 	} else {
 		_list->setMinimalHeight(geometry.width(), _scroll->height());
 	}
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
index ad173385d37ff..d5b1e05d5ed58 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -205,6 +205,7 @@ class Selector final : public Ui::RpWidget {
 	Ui::PlainShadow *_shadow = nullptr;
 	rpl::variable<int> _shadowTop = 0;
 	rpl::variable<int> _shadowSkip = 0;
+	bool _showEmptySearch = false;
 
 	QImage _paintBuffer;
 	Ui::Animations::Simple _expanding;
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 3cfc57d0b66a1..b56491bcb976e 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -29,9 +29,12 @@ For license and copyright information please follow this link:
 #include "ui/chat/chat_theme.h"
 #include "ui/effects/path_shift_gradient.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/shadow.h"
+#include "ui/wrap/padding_wrap.h"
 #include "ui/painter.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
@@ -42,6 +45,7 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
+#include "settings/settings_premium.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
 #include "styles/style_chat.h"
@@ -89,6 +93,8 @@ class EffectPreview final : public Ui::RpWidget {
 	void paintEvent(QPaintEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
 
+	[[nodiscard]] bool canSend() const;
+
 	void setupGeometry(QPoint position);
 	void setupBackground();
 	void setupItem();
@@ -110,6 +116,9 @@ class EffectPreview final : public Ui::RpWidget {
 	const AdminLog::OwnedItem _replyTo;
 	const AdminLog::OwnedItem _item;
 	const std::unique_ptr<Ui::FlatButton> _send;
+	const std::unique_ptr<Ui::PaddingWrap<Ui::FlatLabel>> _premiumPromoLabel;
+	const not_null<Ui::RpWidget*> _bottom;
+	const Fn<void()> _close;
 	const Fn<void(Action, Details)> _actionWithEffect;
 
 	QImage _icon;
@@ -236,11 +245,26 @@ EffectPreview::EffectPreview(
 	_replyTo->data()->fullId(),
 	tr::lng_settings_chat_message_reply(tr::now),
 	_effectId))
-, _send(
-	std::make_unique<BottomRounded>(
+, _send(canSend()
+	? std::make_unique<BottomRounded>(
 		this,
 		tr::lng_effect_send(tr::now),
-		st::effectPreviewSend))
+		st::effectPreviewSend)
+	: nullptr)
+, _premiumPromoLabel(canSend()
+	? nullptr
+	: std::make_unique<Ui::PaddingWrap<Ui::FlatLabel>>(
+		this,
+		object_ptr<Ui::FlatLabel>(
+			this,
+			tr::lng_effect_premium(
+				lt_link,
+				tr::lng_effect_premium_link() | Ui::Text::ToLink(),
+				Ui::Text::WithEntities),
+			st::effectPreviewPromoLabel),
+		st::effectPreviewPromoPadding))
+, _bottom(_send ? ((Ui::RpWidget*)_send.get()) : _premiumPromoLabel.get())
+, _close(done)
 , _actionWithEffect(ComposeActionWithEffect(action, _effectId, done)) {
 	setupGeometry(position);
 	setupBackground();
@@ -291,8 +315,9 @@ void EffectPreview::setupGeometry(QPoint position) {
 	const auto shadow = st::previewMenu.shadow;
 	const auto extend = shadow.extend;
 	_inner = QRect(QPoint(extend.left(), extend.top()), innerSize);
+	_bottom->resizeToWidth(_inner.width());
 	const auto size = _inner.marginsAdded(extend).size()
-		+ QSize(0, _send->height());
+		+ QSize(0, _bottom->height());
 	const auto left = std::max(
 		std::min(
 			position.x() - size.width() / 2,
@@ -305,11 +330,11 @@ void EffectPreview::setupGeometry(QPoint position) {
 			parent->height() - size.height()),
 		topMin);
 	setGeometry(left, top, size.width(), size.height());
-	_send->setGeometry(
+	_bottom->setGeometry(
 		_inner.x(),
 		_inner.y() + _inner.height(),
 		_inner.width(),
-		_send->height());
+		_bottom->height());
 }
 
 void EffectPreview::setupBackground() {
@@ -343,7 +368,7 @@ void EffectPreview::setupItem() {
 
 void EffectPreview::repaintBackground() {
 	const auto ratio = style::DevicePixelRatio();
-	const auto inner = _inner.size() + QSize(0, _send->height());
+	const auto inner = _inner.size() + QSize(0, _bottom->height());
 	auto bg = QImage(
 		inner * ratio,
 		QImage::Format_ARGB32_Premultiplied);
@@ -357,7 +382,7 @@ void EffectPreview::repaintBackground() {
 			QSize(inner.width(), inner.height() * 5),
 			QRect(QPoint(), inner));
 		p.fillRect(
-			QRect(0, _inner.height(), _inner.width(), _send->height()),
+			QRect(0, _inner.height(), _inner.width(), _bottom->height()),
 			st::previewMarkRead.bgColor);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
@@ -409,14 +434,32 @@ void EffectPreview::createLottie() {
 	}, raw->lifetime());
 }
 
+bool EffectPreview::canSend() const {
+	return !_effect.premium || _show->session().premium();
+}
+
 void EffectPreview::setupSend(Details details) {
-	_send->setClickedCallback([=] {
-		_actionWithEffect(Api::SendOptions(), details);
-	});
-	const auto type = details.type;
-	SetupMenuAndShortcuts(_send.get(), _show, [=] {
-		return Details{ .type = type };
-	}, _actionWithEffect);
+	if (_send) {
+		_send->setClickedCallback([=] {
+			_actionWithEffect(Api::SendOptions(), details);
+		});
+		const auto type = details.type;
+		SetupMenuAndShortcuts(_send.get(), _show, [=] {
+			return Details{ .type = type };
+		}, _actionWithEffect);
+	} else {
+		_premiumPromoLabel->entity()->setClickHandlerFilter([=](auto&&...) {
+			const auto window = _show->resolveWindow(
+				ChatHelpers::WindowUsage::PremiumPromo);
+			if (window) {
+				if (const auto onstack = _close) {
+					onstack();
+				}
+				Settings::ShowPremium(window, "message_effect");
+			}
+			return false;
+		});
+	}
 }
 
 bool EffectPreview::checkReady() {
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index f194dc8aa281a..18286162235ee 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1120,3 +1120,12 @@ effectPreviewSend: FlatButton(previewMarkRead) {
 	bgColor: transparent;
 	overBgColor: transparent;
 }
+effectPreviewPromoLabel: FlatLabel(defaultFlatLabel) {
+	minWidth: 64px;
+	align: align(top);
+	textFg: windowSubTextFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px);
+	}
+}
+effectPreviewPromoPadding: margins(4px, 6px, 4px, 6px);

From ec5d8b73736f7700339f0aeda5a7ce7631858818 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 May 2024 13:07:37 +0400
Subject: [PATCH 184/400] More robust effect icon loading.

---
 .../SourceFiles/data/data_message_reactions.cpp   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index 78baff83e859e..7a834dcc16d82 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -584,15 +584,14 @@ void Reactions::preloadImageFor(const ReactionId &id) {
 	}
 	auto &set = _images.emplace(id).first->second;
 	set.effect = (id.custom() != 0);
-	const auto i = set.effect
-		? ranges::find(_effects, id, &Reaction::id)
-		: ranges::find(_available, id, &Reaction::id);
-	const auto document = (i == end(set.effect ? _effects : _available))
+	auto &list = set.effect ? _effects : _available;
+	const auto i = ranges::find(list, id, &Reaction::id);
+	const auto document = (i == end(list))
 		? nullptr
 		: i->centerIcon
 		? i->centerIcon
 		: i->selectAnimation.get();
-	if (document || (set.effect && i != end(_effects))) {
+	if (document || (set.effect && i != end(list))) {
 		if (!set.effect || i->centerIcon) {
 			loadImage(set, document, !i->centerIcon);
 		} else {
@@ -656,11 +655,13 @@ QImage Reactions::resolveEffectImageFor(EffectId id) {
 }
 
 QImage Reactions::resolveImageFor(const ReactionId &id) {
-	const auto i = _images.find(id);
+	auto i = _images.find(id);
 	if (i == end(_images)) {
 		preloadImageFor(id);
+		i = _images.find(id);
+		Assert(i != end(_images));
 	}
-	auto &set = (i != end(_images)) ? i->second : _images[id];
+	auto &set = i->second;
 	set.effect = (id.custom() != 0);
 
 	const auto resolve = [&](QImage &image, int size) {

From 8a58ded58268b1f597678004c44afbe34d8028d8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 May 2024 13:31:30 +0400
Subject: [PATCH 185/400] Show effect loading animation.

---
 Telegram/SourceFiles/menu/menu_send.cpp | 41 ++++++++++++++++++++++---
 Telegram/SourceFiles/ui/chat/chat.style |  3 ++
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index b56491bcb976e..450c50d5540c2 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -28,6 +28,7 @@ For license and copyright information please follow this link:
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/effects/path_shift_gradient.h"
+#include "ui/effects/radial_animation.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
@@ -103,6 +104,7 @@ class EffectPreview final : public Ui::RpWidget {
 	void setupSend(Details details);
 	void createLottie();
 
+	bool checkIconBecameLoaded();
 	[[nodiscard]] bool checkReady();
 
 	const EffectId _effectId = 0;
@@ -130,6 +132,8 @@ class EffectPreview final : public Ui::RpWidget {
 	QRect _inner;
 	QImage _bg;
 	QPoint _itemShift;
+	QRect _iconRect;
+	std::unique_ptr<Ui::InfiniteRadialAnimation> _loading;
 
 	rpl::lifetime _readyCheckLifetime;
 
@@ -289,6 +293,28 @@ void EffectPreview::paintEvent(QPaintEvent *e) {
 	_item->draw(p, context);
 	p.translate(-_itemShift);
 
+	checkIconBecameLoaded();
+	if (_icon.isNull()) {
+		if (!_loading) {
+			_loading = std::make_unique<Ui::InfiniteRadialAnimation>([=] {
+				update();
+			}, st::effectPreviewLoading);
+			_loading->start(st::defaultInfiniteRadialAnimation.linearPeriod);
+		}
+		const auto loading = _iconRect.marginsRemoved(
+			{ st::lineWidth, st::lineWidth, st::lineWidth, st::lineWidth });
+		auto hq = PainterHighQualityEnabler(p);
+		Ui::InfiniteRadialAnimation::Draw(
+			p,
+			_loading->computeState(),
+			loading.topLeft(),
+			loading.size(),
+			width(),
+			_chatStyle->msgInDateFg(),
+			st::effectPreviewLoading.thickness);
+	} else {
+		_loading = nullptr;
+	}
 	if (_lottie && _lottie->ready()) {
 		const auto factor = style::DevicePixelRatio();
 		auto request = Lottie::FrameRequest();
@@ -364,6 +390,7 @@ void EffectPreview::setupItem() {
 		shift + icon.x() + (icon.width() - size.width()) / 2,
 		icon.y() + (icon.height() - size.height()) / 2);
 	_itemShift = _inner.topLeft() - position;
+	_iconRect = icon.translated(_itemShift);
 }
 
 void EffectPreview::repaintBackground() {
@@ -462,11 +489,17 @@ void EffectPreview::setupSend(Details details) {
 	}
 }
 
+bool EffectPreview::checkIconBecameLoaded() {
+	if (!_icon.isNull()) {
+		return false;
+	}
+	const auto reactions = &_show->session().data().reactions();
+	_icon = reactions->resolveEffectImageFor(_effect.id.custom());
+	return !_icon.isNull();
+}
+
 bool EffectPreview::checkReady() {
-	if (_icon.isNull()) {
-		const auto reactions = &_show->session().data().reactions();
-		_icon = reactions->resolveEffectImageFor(_effect.id.custom());
-		repaintBackground();
+	if (checkIconBecameLoaded()) {
 		update();
 	}
 	if (_effect.aroundAnimation) {
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 18286162235ee..1d7361bdd2d71 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1129,3 +1129,6 @@ effectPreviewPromoLabel: FlatLabel(defaultFlatLabel) {
 	}
 }
 effectPreviewPromoPadding: margins(4px, 6px, 4px, 6px);
+effectPreviewLoading: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
+	thickness: 2px;
+}

From 487fa9728a8943c298e8b94183c96312e9e67197 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 May 2024 14:07:38 +0400
Subject: [PATCH 186/400] Fade in/out effect preview.

---
 .../data/data_message_reactions.cpp           |   8 +-
 .../SourceFiles/data/data_message_reactions.h |   4 +
 .../history_view_reactions_selector.cpp       |  16 +-
 .../history_view_reactions_selector.h         |   6 +-
 .../media/stories/media_stories_reactions.cpp |   3 +-
 Telegram/SourceFiles/menu/menu_send.cpp       | 182 ++++++++++++------
 6 files changed, 155 insertions(+), 64 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index 7a834dcc16d82..f1175a47340ff 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -575,7 +575,9 @@ void Reactions::preloadReactionImageFor(const ReactionId &emoji) {
 }
 
 void Reactions::preloadEffectImageFor(EffectId id) {
-	preloadImageFor({ DocumentId(id) });
+	if (id != kFakeEffectId) {
+		preloadImageFor({ DocumentId(id) });
+	}
 }
 
 void Reactions::preloadImageFor(const ReactionId &id) {
@@ -651,7 +653,9 @@ QImage Reactions::resolveReactionImageFor(const ReactionId &emoji) {
 }
 
 QImage Reactions::resolveEffectImageFor(EffectId id) {
-	return resolveImageFor({ DocumentId(id) });
+	return (id == kFakeEffectId)
+		? QImage()
+		: resolveImageFor({ DocumentId(id) });
 }
 
 QImage Reactions::resolveImageFor(const ReactionId &id) {
diff --git a/Telegram/SourceFiles/data/data_message_reactions.h b/Telegram/SourceFiles/data/data_message_reactions.h
index 98aab8d851821..793fcc19813fc 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.h
+++ b/Telegram/SourceFiles/data/data_message_reactions.h
@@ -119,6 +119,10 @@ class Reactions final : private CustomEmojiManager::Listener {
 	void preloadReactionImageFor(const ReactionId &emoji);
 	[[nodiscard]] QImage resolveReactionImageFor(const ReactionId &emoji);
 
+	// This is used to reserve space for the effect in BottomInfo but not
+	// actually paint anything, used in case we want to paint icon ourselves.
+	static constexpr auto kFakeEffectId = EffectId(1);
+
 	void preloadEffectImageFor(EffectId id);
 	[[nodiscard]] QImage resolveEffectImageFor(EffectId id);
 
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index 7173d3aed45dd..dcac6a69e7104 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -203,6 +203,7 @@ Selector::Selector(
 	TextWithEntities about,
 	Fn<void(bool fast)> close,
 	IconFactory iconFactory,
+	Fn<bool()> paused,
 	bool child)
 : Selector(
 	parent,
@@ -216,8 +217,9 @@ Selector::Selector(
 		: ChatHelpers::EmojiListMode::MessageEffects),
 	{},
 	std::move(about),
-	iconFactory,
-	close,
+	std::move(iconFactory),
+	std::move(paused),
+	std::move(close),
 	child) {
 }
 
@@ -253,6 +255,7 @@ Selector::Selector(
 	std::vector<DocumentId> recent,
 	TextWithEntities about,
 	IconFactory iconFactory,
+	Fn<bool()> paused,
 	Fn<void(bool fast)> close,
 	bool child)
 : RpWidget(parent)
@@ -261,6 +264,7 @@ Selector::Selector(
 , _reactions(reactions)
 , _recent(std::move(recent))
 , _listMode(mode)
+, _paused(std::move(paused))
 , _jumpedToPremium([=] { close(false); })
 , _cachedRound(
 	QSize(2 * st::reactStripSkip + st::reactStripSize, st::reactStripHeight),
@@ -1005,7 +1009,7 @@ void Selector::createList() {
 		object_ptr<EmojiListWidget>(lists, EmojiListDescriptor{
 			.show = _show,
 			.mode = _listMode,
-			.paused = [] { return false; },
+			.paused = _paused ? _paused : [] { return false; },
 			.customRecentList = std::move(recentList),
 			.customRecentFactory = _unifiedFactoryOwner->factory(),
 			.freeEffects = std::move(freeEffects),
@@ -1026,7 +1030,7 @@ void Selector::createList() {
 				StickersListDescriptor{
 					.show = _show,
 					.mode = StickersListMode::MessageEffects,
-					.paused = [] { return false; },
+					.paused = _paused ? _paused : [] { return false; },
 					.customRecentList = std::move(descriptors),
 					.st = st,
 				}));
@@ -1352,7 +1356,8 @@ auto AttachSelectorToMenu(
 	std::shared_ptr<ChatHelpers::Show> show,
 	const Data::PossibleItemReactionsRef &reactions,
 	TextWithEntities about,
-	IconFactory iconFactory)
+	IconFactory iconFactory,
+	Fn<bool()> paused)
 -> base::expected<not_null<Selector*>, AttachSelectorResult> {
 	if (reactions.recent.empty()) {
 		return base::make_unexpected(AttachSelectorResult::Skipped);
@@ -1366,6 +1371,7 @@ auto AttachSelectorToMenu(
 		std::move(about),
 		[=](bool fast) { menu->hideMenu(fast); },
 		std::move(iconFactory),
+		std::move(paused),
 		false); // child
 	if (!AdjustMenuGeometryForSelector(menu, desiredPosition, selector)) {
 		return base::make_unexpected(AttachSelectorResult::Failed);
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
index d5b1e05d5ed58..56f5210b78dea 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -85,6 +85,7 @@ class Selector final : public Ui::RpWidget {
 		TextWithEntities about,
 		Fn<void(bool fast)> close,
 		IconFactory iconFactory = nullptr,
+		Fn<bool()> paused = nullptr,
 		bool child = false);
 #if 0 // not ready
 	Selector(
@@ -149,6 +150,7 @@ class Selector final : public Ui::RpWidget {
 		std::vector<DocumentId> recent,
 		TextWithEntities about,
 		IconFactory iconFactory,
+		Fn<bool()> paused,
 		Fn<void(bool fast)> close,
 		bool child);
 
@@ -187,6 +189,7 @@ class Selector final : public Ui::RpWidget {
 	const Data::PossibleItemReactions _reactions;
 	const std::vector<DocumentId> _recent;
 	const ChatHelpers::EmojiListMode _listMode;
+	const Fn<bool()> _paused;
 	Fn<void()> _jumpedToPremium;
 	Ui::RoundAreaWithShadow _cachedRound;
 	std::unique_ptr<Strip> _strip;
@@ -274,7 +277,8 @@ AttachSelectorResult AttachSelectorToMenu(
 	std::shared_ptr<ChatHelpers::Show> show,
 	const Data::PossibleItemReactionsRef &reactions,
 	TextWithEntities about,
-	IconFactory iconFactory = nullptr
+	IconFactory iconFactory = nullptr,
+	Fn<bool()> paused = nullptr
 ) -> base::expected<not_null<Selector*>, AttachSelectorResult>;
 
 [[nodiscard]] TextWithEntities ItemReactionsAbout(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index 30055ad0b7aaf..af45d91507f3b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -668,7 +668,8 @@ void Reactions::Panel::create() {
 			? tr::lng_stories_reaction_as_message(tr::now)
 			: QString()) },
 		[=](bool fast) { hide(mode); },
-		nullptr,
+		nullptr, // iconFactory
+		nullptr, // paused
 		true);
 
 	_selector->chosen(
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 450c50d5540c2..98645e79f1263 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -59,6 +59,8 @@ For license and copyright information please follow this link:
 namespace SendMenu {
 namespace {
 
+constexpr auto kToggleDuration = crl::time(400);
+
 class Delegate final : public HistoryView::DefaultElementDelegate {
 public:
 	Delegate(not_null<Ui::PathShiftGradient*> pathGradient)
@@ -90,6 +92,8 @@ class EffectPreview final : public Ui::RpWidget {
 		Fn<void(Action, Details)> action,
 		Fn<void()> done);
 
+	void hideAnimated();
+
 private:
 	void paintEvent(QPaintEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
@@ -104,8 +108,12 @@ class EffectPreview final : public Ui::RpWidget {
 	void setupSend(Details details);
 	void createLottie();
 
+	[[nodiscard]] bool ready() const;
+	void paintLoading(QPainter &p);
+	void paintLottie(QPainter &p);
 	bool checkIconBecameLoaded();
-	[[nodiscard]] bool checkReady();
+	[[nodiscard]] bool checkLoaded();
+	void toggle(bool shown);
 
 	const EffectId _effectId = 0;
 	const Data::Reaction _effect;
@@ -135,6 +143,10 @@ class EffectPreview final : public Ui::RpWidget {
 	QRect _iconRect;
 	std::unique_ptr<Ui::InfiniteRadialAnimation> _loading;
 
+	Ui::Animations::Simple _shownAnimation;
+	QPixmap _bottomCache;
+	bool _hiding = false;
+
 	rpl::lifetime _readyCheckLifetime;
 
 };
@@ -248,7 +260,7 @@ EffectPreview::EffectPreview(
 	_history->peer->id,
 	_replyTo->data()->fullId(),
 	tr::lng_settings_chat_message_reply(tr::now),
-	_effectId))
+	Data::Reactions::kFakeEffectId))
 , _send(canSend()
 	? std::make_unique<BottomRounded>(
 		this,
@@ -271,68 +283,87 @@ EffectPreview::EffectPreview(
 , _close(done)
 , _actionWithEffect(ComposeActionWithEffect(action, _effectId, done)) {
 	setupGeometry(position);
-	setupBackground();
 	setupItem();
+	setupBackground();
 	setupLottie();
 	setupSend(details);
+
+	toggle(true);
 }
 
 void EffectPreview::paintEvent(QPaintEvent *e) {
-	auto p = Painter(this);
+	checkIconBecameLoaded();
+
+	const auto progress = _shownAnimation.value(_hiding ? 0. : 1.);
+	if (!progress) {
+		return;
+	}
+
+	auto p = QPainter(this);
+	p.setOpacity(progress);
 	p.drawImage(0, 0, _bg);
 
-	p.setClipRect(_inner);
-	p.translate(_itemShift);
-	auto rect = QRect(0, 0, st::windowMinWidth, _inner.height());
-	auto context = _theme->preparePaintContext(
-		_chatStyle.get(),
-		rect,
-		rect,
-		false);
-	context.outbg = _item->hasOutLayout();
-	_item->draw(p, context);
-	p.translate(-_itemShift);
+	if (!_bottomCache.isNull()) {
+		p.drawPixmap(_bottom->pos(), _bottomCache);
+	}
 
-	checkIconBecameLoaded();
-	if (_icon.isNull()) {
-		if (!_loading) {
-			_loading = std::make_unique<Ui::InfiniteRadialAnimation>([=] {
-				update();
-			}, st::effectPreviewLoading);
-			_loading->start(st::defaultInfiniteRadialAnimation.linearPeriod);
-		}
-		const auto loading = _iconRect.marginsRemoved(
-			{ st::lineWidth, st::lineWidth, st::lineWidth, st::lineWidth });
-		auto hq = PainterHighQualityEnabler(p);
-		Ui::InfiniteRadialAnimation::Draw(
-			p,
-			_loading->computeState(),
-			loading.topLeft(),
-			loading.size(),
-			width(),
-			_chatStyle->msgInDateFg(),
-			st::effectPreviewLoading.thickness);
+	if (!ready()) {
+		paintLoading(p);
 	} else {
 		_loading = nullptr;
-	}
-	if (_lottie && _lottie->ready()) {
-		const auto factor = style::DevicePixelRatio();
-		auto request = Lottie::FrameRequest();
-		request.box = _inner.size() * factor;
-		const auto rightAligned = _item->hasRightLayout();
-		if (!rightAligned) {
-			request.mirrorHorizontal = true;
+		p.drawImage(_iconRect, _icon);
+		if (!_hiding) {
+			p.setOpacity(1.);
 		}
-		const auto frame = _lottie->frameInfo(request);
-		p.drawImage(
-			QRect(_inner.topLeft(), frame.image.size() / factor),
-			frame.image);
-		_lottie->markFrameShown();
+		paintLottie(p);
 	}
 }
 
+bool EffectPreview::ready() const {
+	return !_icon.isNull() && _lottie && _lottie->ready();
+}
+
+void EffectPreview::paintLoading(QPainter &p) {
+	if (!_loading) {
+		_loading = std::make_unique<Ui::InfiniteRadialAnimation>([=] {
+			update();
+		}, st::effectPreviewLoading);
+		_loading->start(st::defaultInfiniteRadialAnimation.linearPeriod);
+	}
+	const auto loading = _iconRect.marginsRemoved(
+		{ st::lineWidth, st::lineWidth, st::lineWidth, st::lineWidth });
+	auto hq = PainterHighQualityEnabler(p);
+	Ui::InfiniteRadialAnimation::Draw(
+		p,
+		_loading->computeState(),
+		loading.topLeft(),
+		loading.size(),
+		width(),
+		_chatStyle->msgInDateFg(),
+		st::effectPreviewLoading.thickness);
+}
+
+void EffectPreview::paintLottie(QPainter &p) {
+	const auto factor = style::DevicePixelRatio();
+	auto request = Lottie::FrameRequest();
+	request.box = _inner.size() * factor;
+	const auto rightAligned = _item->hasRightLayout();
+	if (!rightAligned) {
+		request.mirrorHorizontal = true;
+	}
+	const auto frame = _lottie->frameInfo(request);
+	p.drawImage(
+		QRect(_inner.topLeft(), frame.image.size() / factor),
+		frame.image);
+	_lottie->markFrameShown();
+}
+
+void EffectPreview::hideAnimated() {
+	toggle(false);
+}
+
 void EffectPreview::mousePressEvent(QMouseEvent *e) {
-	delete this;
+	hideAnimated();
 }
 
 void EffectPreview::setupGeometry(QPoint position) {
@@ -402,7 +433,7 @@ void EffectPreview::repaintBackground() {
 	bg.setDevicePixelRatio(ratio);
 
 	{
-		auto p = QPainter(&bg);
+		auto p = Painter(&bg);
 		Window::SectionWidget::PaintBackground(
 			p,
 			_theme.get(),
@@ -411,6 +442,18 @@ void EffectPreview::repaintBackground() {
 		p.fillRect(
 			QRect(0, _inner.height(), _inner.width(), _bottom->height()),
 			st::previewMarkRead.bgColor);
+
+		p.translate(_itemShift - _inner.topLeft());
+		auto rect = QRect(0, 0, st::windowMinWidth, _inner.height());
+		auto context = _theme->preparePaintContext(
+			_chatStyle.get(),
+			rect,
+			rect,
+			false);
+		context.outbg = _item->hasOutLayout();
+		_item->draw(p, context);
+		p.translate(_inner.topLeft() - _itemShift);
+
 		auto hq = PainterHighQualityEnabler(p);
 		p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
 		auto roundRect = Ui::RoundRect(st::previewMenu.radius, st::menuBg);
@@ -438,7 +481,7 @@ void EffectPreview::setupLottie() {
 	rpl::single(rpl::empty) | rpl::then(
 		_show->session().downloaderTaskFinished()
 	) | rpl::start_with_next([=] {
-		if (checkReady()) {
+		if (checkLoaded()) {
 			_readyCheckLifetime.destroy();
 			createLottie();
 		}
@@ -495,10 +538,14 @@ bool EffectPreview::checkIconBecameLoaded() {
 	}
 	const auto reactions = &_show->session().data().reactions();
 	_icon = reactions->resolveEffectImageFor(_effect.id.custom());
-	return !_icon.isNull();
+	if (_icon.isNull()) {
+		return false;
+	}
+	repaintBackground();
+	return true;
 }
 
-bool EffectPreview::checkReady() {
+bool EffectPreview::checkLoaded() {
 	if (checkIconBecameLoaded()) {
 		update();
 	}
@@ -511,6 +558,29 @@ bool EffectPreview::checkReady() {
 	return !_icon.isNull() && (!_bytes.isEmpty() || !_filepath.isEmpty());
 }
 
+void EffectPreview::toggle(bool shown) {
+	if (!shown && _hiding) {
+		return;
+	}
+	_hiding = !shown;
+	if (_bottomCache.isNull()) {
+		_bottomCache = Ui::GrabWidget(_bottom);
+		_bottom->hide();
+	}
+	_shownAnimation.start([=] {
+		update();
+		if (!_shownAnimation.animating()) {
+			if (_hiding) {
+				delete this;
+			} else {
+				_bottomCache = QPixmap();
+				_bottom->show();
+			}
+		}
+	}, shown ? 0. : 1., shown ? 1. : 0., kToggleDuration, anim::easeOutCirc);
+	show();
+}
+
 } // namespace
 
 Fn<void(Action, Details)> DefaultCallback(
@@ -571,6 +641,7 @@ FillMenuResult FillSendMenu(
 	}
 
 	using namespace HistoryView::Reactions;
+	const auto effect = std::make_shared<QPointer<EffectPreview>>();
 	const auto position = desiredPositionOverride.value_or(QCursor::pos());
 	const auto selector = (showForEffect && details.effectAllowed)
 		? AttachSelectorToMenu(
@@ -579,7 +650,9 @@ FillMenuResult FillSendMenu(
 			st::reactPanelEmojiPan,
 			showForEffect,
 			LookupPossibleEffects(&showForEffect->session()),
-			{ tr::lng_effect_add_title(tr::now) })
+			{ tr::lng_effect_add_title(tr::now) },
+			nullptr, // iconFactory
+			[=] { return (*effect) != nullptr; }) // paused
 		: base::make_unexpected(AttachSelectorResult::Skipped);
 	if (!selector) {
 		if (selector.error() == AttachSelectorResult::Failed) {
@@ -589,7 +662,6 @@ FillMenuResult FillSendMenu(
 		return FillMenuResult::Prepared;
 	}
 
-	const auto effect = std::make_shared<QPointer<EffectPreview>>();
 	(*selector)->chosen(
 	) | rpl::start_with_next([=](ChosenReaction chosen) {
 		const auto &reactions = showForEffect->session().data().reactions();
@@ -597,7 +669,7 @@ FillMenuResult FillSendMenu(
 		const auto i = ranges::find(effects, chosen.id, &Data::Reaction::id);
 		if (i != end(effects)) {
 			if (const auto strong = effect->data()) {
-				delete strong;
+				strong->hideAnimated();
 			}
 			const auto weak = Ui::MakeWeak(menu);
 			const auto done = [=] {

From a011a7c3160c2d3ec3e46c01e58bcd94bb6545a0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 May 2024 14:47:34 +0400
Subject: [PATCH 187/400] Fix sending scheduled effects.

---
 .../SourceFiles/boxes/create_poll_box.cpp     |  4 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  2 +-
 Telegram/SourceFiles/boxes/share_box.cpp      | 29 +++++-------
 Telegram/SourceFiles/boxes/share_box.h        |  1 -
 .../SourceFiles/history/history_widget.cpp    | 13 +++--
 Telegram/SourceFiles/history/history_widget.h |  2 +-
 .../view/history_view_context_menu.cpp        |  1 +
 .../view/history_view_schedule_box.cpp        | 35 +++++++++-----
 .../history/view/history_view_schedule_box.h  |  8 ++--
 Telegram/SourceFiles/menu/menu_send.cpp       | 47 ++++++++++---------
 Telegram/SourceFiles/menu/menu_send.h         | 13 +++--
 11 files changed, 86 insertions(+), 69 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 8b032b81aeda6..151ab54b8eb05 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -1304,7 +1304,9 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 
 	const auto isNormal = (_sendType == Api::SendType::Normal);
 	const auto schedule = [=] {
-		sendAction(SendMenu::ActionType::Schedule, _sendMenuDetails());
+		sendAction(
+			{ .type = SendMenu::ActionType::Schedule },
+			_sendMenuDetails());
 	};
 	const auto submit = addButton(
 		(isNormal
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 6ba4771f8b135..c28a1dc709ece 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -1427,7 +1427,7 @@ void SendFilesBox::send(
 		|| _sendType == Api::SendType::ScheduledToUser)
 		&& !options.scheduled) {
 		return SendMenu::DefaultCallback(_show, sendCallback())(
-			SendMenu::ActionType::Schedule,
+			{ .type = SendMenu::ActionType::Schedule },
 			_sendMenuDetails());
 	}
 	if (_preparing) {
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 3d42c5afe88bf..043a8ad18650a 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -523,12 +523,19 @@ void ShareBox::showMenu(not_null<Ui::RpWidget*> parent) {
 
 	using namespace SendMenu;
 	const auto sendAction = crl::guard(this, [=](Action action, Details) {
-		const auto options = std::get_if<Api::SendOptions>(&action);
-		if (options || v::get<ActionType>(action) == ActionType::Send) {
-			submit(options ? *options : Api::SendOptions());
-		} else {
-			submitScheduled();
+		if (action.type == ActionType::Send) {
+			submit(action.options);
+			return;
 		}
+		uiShow()->showBox(
+			HistoryView::PrepareScheduleBox(
+				this,
+				nullptr, // ChatHelpers::Show for effect attachment.
+				sendMenuDetails(),
+				[=](Api::SendOptions options) { submit(options); },
+				action.options,
+				HistoryView::DefaultScheduleTime(),
+				_descriptor.scheduleBoxStyle));
 	});
 	_menu->setForcedVerticalOrigin(Ui::PopupMenu::VerticalOrigin::Bottom);
 	const auto result = FillSendMenu(
@@ -620,18 +627,6 @@ void ShareBox::submit(Api::SendOptions options) {
 	}
 }
 
-void ShareBox::submitScheduled() {
-	const auto callback = [=](Api::SendOptions options) { submit(options); };
-	uiShow()->showBox(
-		HistoryView::PrepareScheduleBox(
-			this,
-			nullptr, // ChatHelpers::Show for effect attachment.
-			sendMenuDetails(),
-			callback,
-			HistoryView::DefaultScheduleTime(),
-			_descriptor.scheduleBoxStyle));
-}
-
 void ShareBox::copyLink() const {
 	if (const auto onstack = _descriptor.copyCallback) {
 		onstack();
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index 5e48430cd2fc0..32e824b15cff4 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -130,7 +130,6 @@ class ShareBox final : public Ui::BoxContent {
 	void scrollAnimationCallback();
 
 	void submit(Api::SendOptions options);
-	void submitScheduled();
 	void copyLink() const;
 	bool searchByUsername(bool useCache = false);
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index ca3803cff8684..e68bade1a4130 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -324,11 +324,10 @@ HistoryWidget::HistoryWidget(
 	{
 		using namespace SendMenu;
 		const auto sendAction = [=](Action action, Details) {
-			const auto options = std::get_if<Api::SendOptions>(&action);
-			if (options || v::get<ActionType>(action) == ActionType::Send) {
-				send(options ? *options : Api::SendOptions());
+			if (action.type == ActionType::Send) {
+				send(action.options);
 			} else {
-				sendScheduled();
+				sendScheduled(action.options);
 			}
 		};
 		SetupMenuAndShortcuts(
@@ -4192,7 +4191,7 @@ void HistoryWidget::sendWithModifiers(Qt::KeyboardModifiers modifiers) {
 	send({ .handleSupportSwitch = Support::HandleSwitch(modifiers) });
 }
 
-void HistoryWidget::sendScheduled() {
+void HistoryWidget::sendScheduled(Api::SendOptions initialOptions) {
 	if (!_list) {
 		return;
 	}
@@ -4202,13 +4201,13 @@ void HistoryWidget::sendScheduled() {
 			ignoreSlowmodeCountdown)) {
 		return;
 	}
-	const auto callback = [=](Api::SendOptions options) { send(options); };
 	controller()->show(
 		HistoryView::PrepareScheduleBox(
 			_list,
 			controller()->uiShow(),
 			sendMenuDetails(),
-			callback));
+			[=](Api::SendOptions options) { send(options); },
+			initialOptions));
 }
 
 SendMenu::Details HistoryWidget::sendMenuDetails() const {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index ca2a9ed47315c..bc3641e6744ab 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -395,7 +395,7 @@ class HistoryWidget final
 		Api::SendOptions options) const;
 	void send(Api::SendOptions options);
 	void sendWithModifiers(Qt::KeyboardModifiers modifiers);
-	void sendScheduled();
+	void sendScheduled(Api::SendOptions initialOptions);
 	[[nodiscard]] SendMenu::Details sendButtonMenuDetails() const;
 	void handlePendingHistoryUpdate();
 	void fullInfoUpdated();
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 781a4875d77cf..a02f4c7865d2e 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -592,6 +592,7 @@ bool AddRescheduleAction(
 				request.navigation->uiShow(),
 				{ .type = sendMenuType, .effectAllowed = false },
 				callback,
+				{}, // initial options
 				date));
 
 		owner->itemRemoved(
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
index 09288fed75dc1..9ab0af794e97a 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
@@ -70,28 +70,34 @@ bool CanScheduleUntilOnline(not_null<PeerData*> peer) {
 void ScheduleBox(
 		not_null<Ui::GenericBox*> box,
 		std::shared_ptr<ChatHelpers::Show> show,
+		const Api::SendOptions &initialOptions,
 		const SendMenu::Details &details,
 		Fn<void(Api::SendOptions)> done,
 		TimeId time,
 		ScheduleBoxStyleArgs style) {
-	const auto save = [=](bool silent, TimeId scheduleDate) {
-		if (!scheduleDate) {
+	const auto submit = [=](Api::SendOptions options) {
+		if (!options.scheduled) {
 			return;
 		}
-		auto result = Api::SendOptions();
 		// Pro tip: Hold Ctrl key to send a silent scheduled message!
-		result.silent = silent || base::IsCtrlPressed();
-		result.scheduled = scheduleDate;
+		if (base::IsCtrlPressed()) {
+			options.silent = true;
+		}
 		const auto copy = done;
 		box->closeBox();
-		copy(result);
+		copy(options);
+	};
+	const auto with = [=](TimeId scheduled) {
+		auto result = initialOptions;
+		result.scheduled = scheduled;
+		return result;
 	};
 	auto descriptor = Ui::ChooseDateTimeBox(box, {
 		.title = (details.type == SendMenu::Type::Reminder
 			? tr::lng_remind_title()
 			: tr::lng_schedule_title()),
 		.submit = tr::lng_schedule_button(),
-		.done = [=](TimeId result) { save(false, result); },
+		.done = [=](TimeId result) { submit(with(result)); },
 		.time = time,
 		.style = style.chooseDateTimeArgs,
 	});
@@ -105,9 +111,16 @@ void ScheduleBox(
 		.effectAllowed = details.effectAllowed,
 	};
 	const auto sendAction = crl::guard(box, [=](Action action, Details) {
-		save(
-			v::get<Api::SendOptions>(action).silent,
-			descriptor.collect());
+		Expects(action.type == ActionType::Send);
+
+		auto options = with(descriptor.collect());
+		if (action.options.silent) {
+			options.silent = action.options.silent;
+		}
+		if (action.options.effectId) {
+			options.effectId = action.options.effectId;
+		}
+		submit(options);
 	});
 	SetupMenuAndShortcuts(
 		descriptor.submit.data(),
@@ -120,7 +133,7 @@ void ScheduleBox(
 		const auto timestamp = Api::kScheduledUntilOnlineTimestamp;
 		FillSendUntilOnlineMenu(
 			sendUntilOnline.data(),
-			[=] { save(false, timestamp); },
+			[=] { submit(with(timestamp)); },
 			style);
 	}
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.h b/Telegram/SourceFiles/history/view/history_view_schedule_box.h
index a6917710247a5..5f5385c73e584 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.h
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "api/api_common.h"
 #include "ui/boxes/choose_date_time.h"
 
 namespace style {
@@ -14,10 +15,6 @@ struct IconButton;
 struct PopupMenu;
 } // namespace style
 
-namespace Api {
-struct SendOptions;
-} // namespace Api
-
 namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
@@ -41,6 +38,7 @@ struct ScheduleBoxStyleArgs {
 void ScheduleBox(
 	not_null<Ui::GenericBox*> box,
 	std::shared_ptr<ChatHelpers::Show> show,
+	const Api::SendOptions &initialOptions,
 	const SendMenu::Details &details,
 	Fn<void(Api::SendOptions)> done,
 	TimeId time,
@@ -52,11 +50,13 @@ template <typename Guard, typename Submit>
 		std::shared_ptr<ChatHelpers::Show> show,
 		const SendMenu::Details &details,
 		Submit &&submit,
+		const Api::SendOptions &initialOptions = {},
 		TimeId scheduleTime = DefaultScheduleTime(),
 		ScheduleBoxStyleArgs style = ScheduleBoxStyleArgs()) {
 	return Box(
 		ScheduleBox,
 		std::move(show),
+		initialOptions,
 		details,
 		crl::guard(std::forward<Guard>(guard), std::forward<Submit>(submit)),
 		scheduleTime,
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 98645e79f1263..89be563562517 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -214,9 +214,8 @@ void BottomRounded::paintEvent(QPaintEvent *e) {
 		EffectId id,
 		Fn<void()> done) {
 	return [=](Action action, Details details) {
-		if (const auto options = std::get_if<Api::SendOptions>(&action)) {
-			options->effectId = id;
-		}
+		action.options.effectId = id;
+
 		const auto onstack = done;
 		sendAction(action, details);
 		if (onstack) {
@@ -511,7 +510,7 @@ bool EffectPreview::canSend() const {
 void EffectPreview::setupSend(Details details) {
 	if (_send) {
 		_send->setClickedCallback([=] {
-			_actionWithEffect(Api::SendOptions(), details);
+			_actionWithEffect({}, details);
 		});
 		const auto type = details.type;
 		SetupMenuAndShortcuts(_send.get(), _show, [=] {
@@ -588,18 +587,20 @@ Fn<void(Action, Details)> DefaultCallback(
 		Fn<void(Api::SendOptions)> send) {
 	const auto guard = Ui::MakeWeak(show->toastParent());
 	return [=](Action action, Details details) {
-		if (const auto options = std::get_if<Api::SendOptions>(&action)) {
-			send(*options);
-		} else if (v::get<ActionType>(action) == ActionType::Send) {
-			send({});
-		} else {
-			using namespace HistoryView;
-			auto box = PrepareScheduleBox(guard, show, details, send);
-			const auto weak = Ui::MakeWeak(box.data());
-			show->showBox(std::move(box));
-			if (const auto strong = weak.data()) {
-				strong->setCloseByOutsideClick(false);
-			}
+		if (action.type == ActionType::Send) {
+			send(action.options);
+			return;
+		}
+		auto box = HistoryView::PrepareScheduleBox(
+			guard,
+			show,
+			details,
+			send,
+			action.options);
+		const auto weak = Ui::MakeWeak(box.data());
+		show->showBox(std::move(box));
+		if (const auto strong = weak.data()) {
+			strong->setCloseByOutsideClick(false);
 		}
 	};
 }
@@ -622,7 +623,9 @@ FillMenuResult FillSendMenu(
 	if (type != Type::Reminder) {
 		menu->addAction(
 			tr::lng_send_silent_message(tr::now),
-			[=] { action(Api::SendOptions{ .silent = true }, details); },
+			[=] { action(
+				{ Api::SendOptions{ .silent = true } },
+				details); },
 			&icons.menuMute);
 	}
 	if (type != Type::SilentOnly) {
@@ -630,13 +633,15 @@ FillMenuResult FillSendMenu(
 			(type == Type::Reminder
 				? tr::lng_reminder_message(tr::now)
 				: tr::lng_schedule_message(tr::now)),
-			[=] { action(ActionType::Schedule, details); },
+			[=] { action({ .type = ActionType::Schedule }, details); },
 			&icons.menuSchedule);
 	}
 	if (type == Type::ScheduledToUser) {
 		menu->addAction(
 			tr::lng_scheduled_send_until_online(tr::now),
-			[=] { action(Api::DefaultSendWhenOnlineOptions(), details); },
+			[=] { action(
+				{ Api::DefaultSendWhenOnlineOptions() },
+				details); },
 			&icons.menuWhenOnline);
 	}
 
@@ -730,14 +735,14 @@ void SetupMenuAndShortcuts(
 		((now != Type::Reminder)
 			&& request->check(Command::SendSilentMessage)
 			&& request->handle([=] {
-				action(Api::SendOptions{ .silent = true }, details());
+				action({ Api::SendOptions{ .silent = true } }, details());
 				return true;
 			}))
 		||
 		((now != Type::SilentOnly)
 			&& request->check(Command::ScheduleMessage)
 			&& request->handle([=] {
-				action(ActionType::Schedule, details());
+				action({ .type = ActionType::Schedule }, details());
 				return true;
 			}))
 		||
diff --git a/Telegram/SourceFiles/menu/menu_send.h b/Telegram/SourceFiles/menu/menu_send.h
index 66004c17964a1..f503a7e56275b 100644
--- a/Telegram/SourceFiles/menu/menu_send.h
+++ b/Telegram/SourceFiles/menu/menu_send.h
@@ -7,14 +7,12 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "api/api_common.h"
+
 namespace style {
 struct ComposeIcons;
 } // namespace style
 
-namespace Api {
-struct SendOptions;
-} // namespace Api
-
 namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
@@ -54,7 +52,12 @@ enum class ActionType {
 	Send,
 	Schedule,
 };
-using Action = std::variant<Api::SendOptions, ActionType>;
+struct Action {
+	using Type = ActionType;
+
+	Api::SendOptions options;
+	Type type = Type::Send;
+};
 [[nodiscard]] Fn<void(Action, Details)> DefaultCallback(
 	std::shared_ptr<ChatHelpers::Show> show,
 	Fn<void(Api::SendOptions)> send);

From f7ab8a21748f1041bc4aaa992106a1a6cc1971db Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 May 2024 14:54:46 +0400
Subject: [PATCH 188/400] Fix Chat / Effect previews in custom themes.

---
 Telegram/SourceFiles/menu/menu_send.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 89be563562517..67e5deaf8c235 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -281,6 +281,8 @@ EffectPreview::EffectPreview(
 , _bottom(_send ? ((Ui::RpWidget*)_send.get()) : _premiumPromoLabel.get())
 , _close(done)
 , _actionWithEffect(ComposeActionWithEffect(action, _effectId, done)) {
+	_chatStyle->apply(_theme.get());
+
 	setupGeometry(position);
 	setupItem();
 	setupBackground();

From cde70b98079e685b35ebf5b3213b5a4c239f881c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 May 2024 18:16:25 +0400
Subject: [PATCH 189/400] Play effects in a separate layer over MainWidget.

---
 .../history/history_inner_widget.cpp          |  8 +-
 .../view/history_view_emoji_interactions.cpp  | 83 ++++++++++++++++---
 .../view/history_view_emoji_interactions.h    | 20 ++++-
 .../history/view/history_view_list_widget.cpp |  8 +-
 4 files changed, 92 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 38483247d9305..1687b50490fee 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -63,6 +63,7 @@ For license and copyright information please follow this link:
 #include "base/call_delayed.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "mainwidget.h"
 #include "menu/menu_item_download_files.h"
 #include "core/application.h"
 #include "apiwrap.h"
@@ -340,6 +341,8 @@ HistoryInner::HistoryInner(
 , _history(history)
 , _elementDelegate(_history->delegateMixin()->delegate())
 , _emojiInteractions(std::make_unique<HistoryView::EmojiInteractions>(
+	this,
+	controller->content(),
 	&controller->session(),
 	[=](not_null<const Element*> view) { return itemTop(view); }))
 , _migrated(history->migrateFrom())
@@ -393,10 +396,6 @@ HistoryInner::HistoryInner(
 			_emojiInteractions->play(std::move(request), view);
 		}
 	}, lifetime());
-	_emojiInteractions->updateRequests(
-	) | rpl::start_with_next([=](QRect rect) {
-		update(rect);
-	}, lifetime());
 	_emojiInteractions->playStarted(
 	) | rpl::start_with_next([=](QString &&emoji) {
 		_controller->emojiInteractions().playStarted(_peer, std::move(emoji));
@@ -1238,7 +1237,6 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 	p.setOpacity(1.);
 
 	_reactionsManager->paint(p, context);
-	_emojiInteractions->paint(p);
 }
 
 bool HistoryInner::eventHook(QEvent *e) {
diff --git a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
index efda8ead15331..de775e17df173 100644
--- a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
@@ -45,9 +45,13 @@ constexpr auto kDropDelayedAfterDelay = crl::time(2000);
 } // namespace
 
 EmojiInteractions::EmojiInteractions(
+	not_null<QWidget*> parent,
+	not_null<QWidget*> layerParent,
 	not_null<Main::Session*> session,
 	Fn<int(not_null<const Element*>)> itemTop)
-: _session(session)
+: _parent(parent)
+, _layerParent(layerParent)
+, _session(session)
 , _itemTop(std::move(itemTop)) {
 	_session->data().viewRemoved(
 	) | rpl::filter([=] {
@@ -282,6 +286,18 @@ void EmojiInteractions::play(
 		return;
 	}
 
+	if (!_layer) {
+		_layer = base::make_unique_q<Ui::RpWidget>(_layerParent);
+		const auto raw = _layer.get();
+		raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+		raw->show();
+		raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+			paint(raw, clip);
+		}, raw->lifetime());
+	}
+	refreshLayerShift();
+	_layer->setGeometry(_layerParent->rect());
+
 	auto lottie = document->session().emojiStickersPack().effectPlayer(
 		document,
 		data,
@@ -302,11 +318,12 @@ void EmojiInteractions::play(
 			const auto i = ranges::find(_plays, raw, [](const Play &p) {
 				return p.lottie.get();
 			});
-			const auto rect = computeRect(*i).translated(shift);
-			if (rect.y() + rect.height() >= _visibleTop
-				&& rect.y() <= _visibleBottom) {
-				_updateRequests.fire_copy(rect);
+			auto update = computeRect(*i).translated(shift + _layerShift);
+			if (!i->lastTarget.isEmpty()) {
+				update = i->lastTarget.united(update);
 			}
+			_layer->update(update);
+			i->lastTarget = QRect();
 		});
 	}, lottie->lifetime());
 	_plays.push_back({
@@ -331,6 +348,16 @@ void EmojiInteractions::play(
 	}
 }
 
+void EmojiInteractions::refreshLayerShift() {
+	_layerShift = Ui::MapFrom(_layerParent, _parent, QPoint(0, 0));
+}
+
+void EmojiInteractions::refreshLayerGeometryAndUpdate(QRect rect) {
+	if (!rect.isEmpty()) {
+		_layer->update(rect.translated(_layerShift));
+	}
+}
+
 void EmojiInteractions::visibleAreaUpdated(
 		int visibleTop,
 		int visibleBottom) {
@@ -375,12 +402,34 @@ QRect EmojiInteractions::computeRect(const Play &play) const {
 	return QRect(QPoint(left, top), size).translated(play.shift);
 }
 
-void EmojiInteractions::paint(QPainter &p) {
+void EmojiInteractions::paint(not_null<QWidget*> layer, QRect clip) {
+	refreshLayerShift();
+
 	const auto factor = style::DevicePixelRatio();
+	const auto whole = layer->rect();
+
+	auto p = QPainter(layer);
+
+	auto updated = QRect();
+	const auto addRect = [&](QRect rect) {
+		if (updated.isEmpty()) {
+			updated = rect;
+		} else {
+			updated = rect.united(updated);
+		}
+	};
 	for (auto &play : _plays) {
 		if (!play.lottie->ready()) {
 			continue;
 		}
+		const auto target = computeRect(play).translated(_layerShift);
+		if (!target.intersects(whole)) {
+			play.finished = true;
+			addRect(target);
+			continue;
+		} else if (!target.intersects(clip)) {
+			continue;
+		}
 		auto request = Lottie::FrameRequest();
 		request.box = play.outer * factor;
 		const auto rightAligned = play.view->hasRightLayout();
@@ -394,18 +443,18 @@ void EmojiInteractions::paint(QPainter &p) {
 			play.framesCount = information.framesCount;
 			play.frameRate = information.frameRate;
 		}
-		const auto rect = computeRect(play);
 		if (play.started && !play.frame) {
 			play.finished = true;
-			_updateRequests.fire_copy(rect);
+			addRect(target);
 			continue;
 		} else if (play.frame > 0) {
 			play.started = true;
 		}
 		p.drawImage(
-			QRect(rect.topLeft(), frame.image.size() / factor),
+			QRect(target.topLeft(), frame.image.size() / factor),
 			frame.image);
 		play.lottie->markFrameShown();
+		play.lastTarget = target.translated(_layerShift);
 	}
 	_plays.erase(ranges::remove_if(_plays, [](const Play &play) {
 		if (!play.finished) {
@@ -414,6 +463,18 @@ void EmojiInteractions::paint(QPainter &p) {
 		return true;
 	}), end(_plays));
 	checkDelayed();
+
+	if (_plays.empty()) {
+		layer->hide();
+		if (_layer.get() == layer) {
+			crl::on_main([moved = std::move(_layer)] {});
+		}
+	} else if (!updated.isEmpty()) {
+		const auto translated = updated.translated(_layerShift);
+		if (translated.intersects(whole)) {
+			_layer->update(translated);
+		}
+	}
 }
 
 void EmojiInteractions::checkDelayed() {
@@ -456,10 +517,6 @@ void EmojiInteractions::checkDelayed() {
 		good.incoming);
 }
 
-rpl::producer<QRect> EmojiInteractions::updateRequests() const {
-	return _updateRequests.events();
-}
-
 rpl::producer<QString> EmojiInteractions::playStarted() const {
 	return _playStarted.events();
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h
index 679b102a58fa5..6c1f25e8d2793 100644
--- a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h
+++ b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.h
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/unique_qptr.h"
+
 namespace Data {
 class DocumentMedia;
 } // namespace Data
@@ -27,6 +29,10 @@ namespace Stickers {
 enum class EffectType : uint8;
 } // namespace Stickers
 
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
 namespace HistoryView {
 
 class Element;
@@ -34,6 +40,8 @@ class Element;
 class EmojiInteractions final {
 public:
 	EmojiInteractions(
+		not_null<QWidget*> parent,
+		not_null<QWidget*> layerParent,
 		not_null<Main::Session*> session,
 		Fn<int(not_null<const Element*>)> itemTop);
 	~EmojiInteractions();
@@ -50,14 +58,14 @@ class EmojiInteractions final {
 	void playEffectOnRead(not_null<const Element*> view);
 	void playEffect(not_null<const Element*> view);
 
-	void paint(QPainter &p);
-	[[nodiscard]] rpl::producer<QRect> updateRequests() const;
+	void paint(not_null<QWidget*> layer, QRect clip);
 	[[nodiscard]] rpl::producer<QString> playStarted() const;
 
 private:
 	struct Play {
 		not_null<const Element*> view;
 		std::unique_ptr<Lottie::SinglePlayer> lottie;
+		mutable QRect lastTarget;
 		QPoint shift;
 		QSize inner;
 		QSize outer;
@@ -111,15 +119,21 @@ class EmojiInteractions final {
 		const ResolvedEffect &resolved);
 	void checkPendingEffects();
 
+	void refreshLayerShift();
+	void refreshLayerGeometryAndUpdate(QRect rect);
+
+	const not_null<QWidget*> _parent;
+	const not_null<QWidget*> _layerParent;
 	const not_null<Main::Session*> _session;
 	const Fn<int(not_null<const Element*>)> _itemTop;
 
+	base::unique_qptr<Ui::RpWidget> _layer;
+	QPoint _layerShift;
 	int _visibleTop = 0;
 	int _visibleBottom = 0;
 
 	std::vector<Play> _plays;
 	std::vector<Delayed> _delayed;
-	rpl::event_stream<QRect> _updateRequests;
 	rpl::event_stream<QString> _playStarted;
 
 	std::vector<base::weak_ptr<const Element>> _pendingEffects;
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index c8eacd8e35fe9..1b8905dfaa6fc 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -375,6 +375,8 @@ ListWidget::ListWidget(
 , _delegate(delegate)
 , _session(session)
 , _emojiInteractions(std::make_unique<EmojiInteractions>(
+	this,
+	_delegate->listWindow()->content(),
 	session,
 	[=](not_null<const Element*> view) { return itemTop(view); }))
 , _context(_delegate->listContext())
@@ -501,11 +503,6 @@ ListWidget::ListWidget(
 		_isChatWide = wide;
 	}, lifetime());
 
-	_emojiInteractions->updateRequests(
-	) | rpl::start_with_next([=](QRect rect) {
-		update(rect);
-	}, lifetime());
-
 	_selectScroll.scrolls(
 	) | rpl::start_with_next([=](int d) {
 		delegate->listScrollTo(_visibleTop + d, false);
@@ -2278,7 +2275,6 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 	if (_reactionsManager) {
 		_reactionsManager->paint(p, context);
 	}
-	_emojiInteractions->paint(p);
 }
 
 void ListWidget::paintUserpics(

From 363b700f1f805cbcc81786e7ef10426e160a2e7d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 May 2024 18:35:57 +0400
Subject: [PATCH 190/400] Fix chat preview and new emoji interactions.

---
 .../SourceFiles/history/view/history_view_chat_preview.cpp  | 5 +++++
 .../SourceFiles/history/view/history_view_list_widget.cpp   | 6 +++++-
 .../SourceFiles/history/view/history_view_list_widget.h     | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 56d7f648c62a8..fdc7607f93072 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -129,6 +129,7 @@ class Item final
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
 	not_null<Window::SessionController*> listWindow() override;
+	not_null<QWidget*> listEmojiInteractionsParent() override;
 	not_null<const Ui::ChatStyle*> listChatStyle() override;
 	rpl::producer<bool> listChatWideValue() override;
 	std::unique_ptr<Reactions::Manager> listMakeReactionsManager(
@@ -676,6 +677,10 @@ not_null<Window::SessionController*> Item::listWindow() {
 	Unexpected("Item::listWindow.");
 }
 
+not_null<QWidget*> Item::listEmojiInteractionsParent() {
+	return this;
+}
+
 not_null<const Ui::ChatStyle*> Item::listChatStyle() {
 	return _chatStyle.get();
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 1b8905dfaa6fc..a66ba415ea35c 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -101,6 +101,10 @@ not_null<Window::SessionController*> WindowListDelegate::listWindow() {
 	return _window;
 }
 
+not_null<QWidget*> WindowListDelegate::listEmojiInteractionsParent() {
+	return _window->content();
+}
+
 not_null<const Ui::ChatStyle*> WindowListDelegate::listChatStyle() {
 	return _window->chatStyle();
 }
@@ -376,7 +380,7 @@ ListWidget::ListWidget(
 , _session(session)
 , _emojiInteractions(std::make_unique<EmojiInteractions>(
 	this,
-	_delegate->listWindow()->content(),
+	_delegate->listEmojiInteractionsParent(),
 	session,
 	[=](not_null<const Element*> view) { return itemTop(view); }))
 , _context(_delegate->listContext())
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index b85bb7bed6b54..5cfc57c0824ad 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -161,6 +161,7 @@ class ListDelegate {
 
 	// Methods that use Window::SessionController by default.
 	virtual not_null<Window::SessionController*> listWindow() = 0;
+	virtual not_null<QWidget*> listEmojiInteractionsParent() = 0;
 	virtual not_null<const Ui::ChatStyle*> listChatStyle() = 0;
 	virtual rpl::producer<bool> listChatWideValue() = 0;
 	virtual std::unique_ptr<Reactions::Manager> listMakeReactionsManager(
@@ -194,6 +195,7 @@ class WindowListDelegate : public ListDelegate {
 	explicit WindowListDelegate(not_null<Window::SessionController*> window);
 
 	not_null<Window::SessionController*> listWindow() override;
+	not_null<QWidget*> listEmojiInteractionsParent() override;
 	not_null<const Ui::ChatStyle*> listChatStyle() override;
 	rpl::producer<bool> listChatWideValue() override;
 	std::unique_ptr<Reactions::Manager> listMakeReactionsManager(

From 5bfbae3afc9c666823d0589911e24aec35281247 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 12:54:39 +0400
Subject: [PATCH 191/400] Update API scheme on layer 180.

---
 Telegram/SourceFiles/api/api_confirm_phone.cpp           | 4 +++-
 Telegram/SourceFiles/intro/intro_code.cpp                | 8 ++++++--
 Telegram/SourceFiles/mtproto/scheme/api.tl               | 9 +++++----
 .../SourceFiles/passport/passport_form_controller.cpp    | 4 +++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_confirm_phone.cpp b/Telegram/SourceFiles/api/api_confirm_phone.cpp
index f4788e1287e11..3a42a793df602 100644
--- a/Telegram/SourceFiles/api/api_confirm_phone.cpp
+++ b/Telegram/SourceFiles/api/api_confirm_phone.cpp
@@ -97,8 +97,10 @@ void ConfirmPhone::resolve(
 			box->resendRequests(
 			) | rpl::start_with_next([=] {
 				_api.request(MTPauth_ResendCode(
+					MTP_flags(0),
 					MTP_string(phone),
-					MTP_string(phoneHash)
+					MTP_string(phoneHash),
+					MTPstring() // reason
 				)).done([=] {
 					if (boxWeak) {
 						boxWeak->callDone();
diff --git a/Telegram/SourceFiles/intro/intro_code.cpp b/Telegram/SourceFiles/intro/intro_code.cpp
index e5d09140ca9d8..e48e8bb59e698 100644
--- a/Telegram/SourceFiles/intro/intro_code.cpp
+++ b/Telegram/SourceFiles/intro/intro_code.cpp
@@ -266,8 +266,10 @@ void CodeWidget::sendCall() {
 			_callStatus = CallStatus::Calling;
 			_callTimer.cancel();
 			_callRequestId = api().request(MTPauth_ResendCode(
+				MTP_flags(0),
 				MTP_string(getData()->phone),
-				MTP_bytes(getData()->phoneHash)
+				MTP_bytes(getData()->phoneHash),
+				MTPstring() // reason
 			)).done([=](const MTPauth_SentCode &result) {
 				callDone(result);
 			}).send();
@@ -376,8 +378,10 @@ void CodeWidget::noTelegramCode() {
 		return;
 	}
 	_noTelegramCodeRequestId = api().request(MTPauth_ResendCode(
+		MTP_flags(0),
 		MTP_string(getData()->phone),
-		MTP_bytes(getData()->phoneHash)
+		MTP_bytes(getData()->phoneHash),
+		MTPstring() // reason
 	)).done([=](const MTPauth_SentCode &result) {
 		noTelegramCodeDone(result);
 	}).fail([=](const MTP::Error &error) {
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index d83726b0e2fed..c0d2472f9f3db 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -758,7 +758,7 @@ auth.sentCodeTypeMissedCall#82006484 prefix:string length:int = auth.SentCodeTyp
 auth.sentCodeTypeEmailCode#f450f59b flags:# apple_signin_allowed:flags.0?true google_signin_allowed:flags.1?true email_pattern:string length:int reset_available_period:flags.3?int reset_pending_date:flags.4?int = auth.SentCodeType;
 auth.sentCodeTypeSetUpEmailRequired#a5491dea flags:# apple_signin_allowed:flags.0?true google_signin_allowed:flags.1?true = auth.SentCodeType;
 auth.sentCodeTypeFragmentSms#d9565c39 url:string length:int = auth.SentCodeType;
-auth.sentCodeTypeFirebaseSms#e57b1432 flags:# nonce:flags.0?bytes receipt:flags.1?string push_timeout:flags.1?int length:int = auth.SentCodeType;
+auth.sentCodeTypeFirebaseSms#13c90f17 flags:# nonce:flags.0?bytes play_integrity_nonce:flags.2?bytes receipt:flags.1?string push_timeout:flags.1?int length:int = auth.SentCodeType;
 auth.sentCodeTypeSmsWord#a416ac81 flags:# beginning:flags.0?string = auth.SentCodeType;
 auth.sentCodeTypeSmsPhrase#b37794af flags:# beginning:flags.0?string = auth.SentCodeType;
 
@@ -1798,7 +1798,7 @@ invokeWithMessagesRange#365275f2 {X:Type} range:MessageRange query:!X = X;
 invokeWithTakeout#aca9fd2e {X:Type} takeout_id:long query:!X = X;
 invokeWithBusinessConnection#dd289f8e {X:Type} connection_id:string query:!X = X;
 invokeWithGooglePlayIntegrity#1df92984 {X:Type} nonce:string token:string query:!X = X;
-invokeWithApnsSecret#dae54f8#8252da54 {X:Type} nonce:string secret:string query:!X = X;
+invokeWithApnsSecret#0dae54f8 {X:Type} nonce:string secret:string query:!X = X;
 
 auth.sendCode#a677244f phone_number:string api_id:int api_hash:string settings:CodeSettings = auth.SentCode;
 auth.signUp#aac7b717 flags:# no_joined_notifications:flags.0?true phone_number:string phone_code_hash:string first_name:string last_name:string = auth.Authorization;
@@ -1812,7 +1812,7 @@ auth.importBotAuthorization#67a3ff2c flags:int api_id:int api_hash:string bot_au
 auth.checkPassword#d18b4d16 password:InputCheckPasswordSRP = auth.Authorization;
 auth.requestPasswordRecovery#d897bc66 = auth.PasswordRecovery;
 auth.recoverPassword#37096c70 flags:# code:string new_settings:flags.0?account.PasswordInputSettings = auth.Authorization;
-auth.resendCode#3ef1a9bf phone_number:string phone_code_hash:string = auth.SentCode;
+auth.resendCode#cae47523 flags:# phone_number:string phone_code_hash:string reason:flags.0?string = auth.SentCode;
 auth.cancelCode#1f040578 phone_number:string phone_code_hash:string = Bool;
 auth.dropTempAuthKeys#8e48a188 except_auth_keys:Vector<long> = Bool;
 auth.exportLoginToken#b7e085fe api_id:int api_hash:string except_ids:Vector<long> = auth.LoginToken;
@@ -1820,7 +1820,7 @@ auth.importLoginToken#95ac5ce4 token:bytes = auth.LoginToken;
 auth.acceptLoginToken#e894ad4d token:bytes = Authorization;
 auth.checkRecoveryPassword#d36bf79 code:string = Bool;
 auth.importWebTokenAuthorization#2db873a9 api_id:int api_hash:string web_auth_token:string = auth.Authorization;
-auth.requestFirebaseSms#73ab08c0 flags:# phone_number:string phone_code_hash:string play_integrity_token:flags.0?string ios_push_secret:flags.1?string = Bool;
+auth.requestFirebaseSms#8e39261e flags:# phone_number:string phone_code_hash:string safety_net_token:flags.0?string play_integrity_token:flags.2?string ios_push_secret:flags.1?string = Bool;
 auth.resetLoginEmail#7e960193 phone_number:string phone_code_hash:string = auth.SentCode;
 auth.reportMissingCode#cb9deff6 phone_number:string phone_code_hash:string mnc:string = Bool;
 
@@ -2289,6 +2289,7 @@ channels.setBoostsToUnblockRestrictions#ad399cee channel:InputChannel boosts:int
 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;
 
 bots.sendCustomRequest#aa2769ed custom_method:string params:DataJSON = DataJSON;
 bots.answerWebhookJSONQuery#e6213f4d query_id:long data:DataJSON = Bool;
diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index eafb623696acf..b7bc84207269e 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -2261,8 +2261,10 @@ void FormController::requestPhoneCall(not_null<Value*> value) {
 	value->verification.call->setStatus(
 		{ Ui::SentCodeCall::State::Calling, 0 });
 	_api.request(MTPauth_ResendCode(
+		MTP_flags(0),
 		MTP_string(getPhoneFromValue(value)),
-		MTP_string(value->verification.phoneCodeHash)
+		MTP_string(value->verification.phoneCodeHash),
+		MTPstring() // reason
 	)).done([=] {
 		value->verification.call->callDone();
 	}).send();

From 787cf7853e7b4e9097944a8c505f6ab3a9b75e39 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 22:54:22 +0400
Subject: [PATCH 192/400] Implement simple chats search bar.

---
 Telegram/Resources/langs/lang.strings         |  11 ++
 .../boxes/peers/edit_forum_topic_box.cpp      |  29 ++-
 .../boxes/peers/edit_forum_topic_box.h        |   8 +
 .../SourceFiles/data/data_forum_topic.cpp     |  60 +++++-
 Telegram/SourceFiles/data/data_forum_topic.h  |  23 ++-
 .../data/stickers/data_custom_emoji.cpp       |   4 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 158 +++++++++++++++-
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  13 ++
 .../dialogs/ui/chat_search_tabs.cpp           | 178 ++++++++++++++++++
 .../SourceFiles/dialogs/ui/chat_search_tabs.h |  83 ++++++++
 .../info/profile/info_profile_cover.cpp       |   2 +-
 Telegram/cmake/td_ui.cmake                    |   2 +
 12 files changed, 555 insertions(+), 16 deletions(-)
 create mode 100644 Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
 create mode 100644 Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index c0ef61a957eee..47ad8c12d62d4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5174,6 +5174,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_font_system" = "System font";
 "lng_font_not_found" = "Font not found.";
 
+"lng_search_tab_my_messages" = "My Messages";
+"lng_search_tab_this_topic" = "This Topic";
+"lng_search_tab_this_chat" = "This Chat";
+"lng_search_tab_this_channel" = "This Channel";
+"lng_search_tab_this_group" = "This Group";
+"lng_search_tab_public_posts" = "Public Posts";
+"lng_search_tab_no_results" = "No Results";
+"lng_search_tab_no_results_text" = "There were no results for \"{query}\".";
+"lng_search_tab_no_results_retry" = "Try another hashtag.";
+"lng_search_tab_by_hashtag" = "Enter a hashtag to find messages containing it.";
+
 // Wnd specific
 
 "lng_wnd_choose_program_menu" = "Choose Default Program...";
diff --git a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
index 2a48825886ecd..e8a8b9d59dcce 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
@@ -42,10 +42,7 @@ namespace {
 
 constexpr auto kDefaultIconId = DocumentId(0x7FFF'FFFF'FFFF'FFFFULL);
 
-struct DefaultIcon {
-	QString title;
-	int32 colorId = 0;
-};
+using DefaultIcon = Data::TopicIconDescriptor;
 
 class DefaultIconEmoji final : public Ui::Text::CustomEmoji {
 public:
@@ -89,10 +86,14 @@ QString DefaultIconEmoji::entityData() {
 
 void DefaultIconEmoji::paint(QPainter &p, const Context &context) {
 	if (_image.isNull()) {
-		_image = Data::ForumTopicIconFrame(
-			_icon.colorId,
-			_icon.title,
-			st::defaultForumTopicIcon);
+		_image = Data::IsForumGeneralIconTitle(_icon.title)
+			? Data::ForumTopicGeneralIconFrame(
+				st::defaultForumTopicIcon.size,
+				Data::ParseForumGeneralIconColor(_icon.colorId))
+			: Data::ForumTopicIconFrame(
+				_icon.colorId,
+				_icon.title,
+				st::defaultForumTopicIcon);
 	}
 	const auto esize = Ui::Emoji::GetSizeLarge() / style::DevicePixelRatio();
 	const auto customSize = Ui::Text::AdjustCustomEmojiSize(esize);
@@ -212,7 +213,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 	) | rpl::start_with_next([=] {
 		state->frame = Data::ForumTopicGeneralIconFrame(
 			st::largeForumTopicIcon.size,
-			st::windowSubTextFg);
+			st::windowSubTextFg->c);
 		result->update();
 	}, result->lifetime());
 
@@ -261,7 +262,7 @@ struct IconSelector {
 		if (id == kDefaultIconId) {
 			return std::make_unique<DefaultIconEmoji>(
 				rpl::duplicate(defaultIcon),
-				repaint);
+				std::move(repaint));
 		}
 		return manager->create(id, std::move(repaint), tag);
 	};
@@ -572,3 +573,11 @@ void EditForumTopicBox(
 		box->closeBox();
 	});
 }
+
+std::unique_ptr<Ui::Text::CustomEmoji> MakeTopicIconEmoji(
+		Data::TopicIconDescriptor descriptor,
+		Fn<void()> repaint) {
+	return std::make_unique<DefaultIconEmoji>(
+		rpl::single(descriptor),
+		std::move(repaint));
+}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.h b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.h
index fddc3c052d3db..620ecebaf0d33 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.h
@@ -11,6 +11,10 @@ For license and copyright information please follow this link:
 
 class History;
 
+namespace Data {
+struct TopicIconDescriptor;
+} // namespace Data
+
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -25,3 +29,7 @@ void EditForumTopicBox(
 	not_null<Window::SessionController*> controller,
 	not_null<History*> forum,
 	MsgId rootId);
+
+[[nodiscard]] std::unique_ptr<Ui::Text::CustomEmoji> MakeTopicIconEmoji(
+	Data::TopicIconDescriptor descriptor,
+	Fn<void()> repaint);
diff --git a/Telegram/SourceFiles/data/data_forum_topic.cpp b/Telegram/SourceFiles/data/data_forum_topic.cpp
index 7b5391a193396..7285c4c39fcdb 100644
--- a/Telegram/SourceFiles/data/data_forum_topic.cpp
+++ b/Telegram/SourceFiles/data/data_forum_topic.cpp
@@ -143,7 +143,7 @@ QImage ForumTopicIconFrame(
 	return background;
 }
 
-QImage ForumTopicGeneralIconFrame(int size, const style::color &color) {
+QImage ForumTopicGeneralIconFrame(int size, const QColor &color) {
 	const auto ratio = style::DevicePixelRatio();
 	auto svg = QSvgRenderer(ForumTopicIconPath(u"general"_q));
 	auto result = QImage(
@@ -172,6 +172,62 @@ TextWithEntities ForumTopicIconWithTitle(
 		: TextWithEntities{ title };
 }
 
+QString ForumGeneralIconTitle() {
+	return QChar(0) + u"general"_q;
+}
+
+bool IsForumGeneralIconTitle(const QString &title) {
+	return !title.isEmpty() && !title[0].unicode();
+}
+
+int32 ForumGeneralIconColor(const QColor &color) {
+	return int32(uint32(color.red()) << 16
+		| uint32(color.green()) << 8
+		| uint32(color.blue())
+		| (uint32(color.alpha() == 255 ? 0 : color.alpha()) << 24));
+}
+
+QColor ParseForumGeneralIconColor(int32 value) {
+	const auto alpha = uint32(value) >> 24;
+	return QColor(
+		(value >> 16) & 0xFF,
+		(value >> 8) & 0xFF,
+		value & 0xFF,
+		alpha ? alpha : 255);
+}
+
+QString TopicIconEmojiEntity(TopicIconDescriptor descriptor) {
+	return IsForumGeneralIconTitle(descriptor.title)
+		? u"topic_general:"_q + QString::number(uint32(descriptor.colorId))
+		: (u"topic_icon:"_q
+			+ QString::number(uint32(descriptor.colorId))
+			+ ' '
+			+ ExtractNonEmojiLetter(descriptor.title));
+}
+
+TopicIconDescriptor ParseTopicIconEmojiEntity(QStringView entity) {
+	if (!entity.startsWith(u"topic_")) {
+		return {};
+	}
+	const auto general = u"topic_general:"_q;
+	const auto normal = u"topic_icon:"_q;
+	if (entity.startsWith(general)) {
+		return {
+			.title = ForumGeneralIconTitle(),
+			.colorId = int32(entity.mid(general.size()).toUInt()),
+		};
+	} else if (entity.startsWith(normal)) {
+		const auto parts = entity.mid(normal.size()).split(' ');
+		if (parts.size() == 2) {
+			return {
+				.title = parts[1].toString(),
+				.colorId = int32(parts[0].toUInt()),
+			};
+		}
+	}
+	return {};
+}
+
 ForumTopic::ForumTopic(not_null<Forum*> forum, MsgId rootId)
 : Thread(&forum->history()->owner(), Type::ForumTopic)
 , _forum(forum)
@@ -640,7 +696,7 @@ void ForumTopic::validateGeneralIcon(
 		: context.selected
 		? st::dialogsTextFgOver
 		: st::dialogsTextFg;
-	_defaultIcon = ForumTopicGeneralIconFrame(size, color);
+	_defaultIcon = ForumTopicGeneralIconFrame(size, color->c);
 	_flags = (_flags & ~mask) | flags;
 }
 
diff --git a/Telegram/SourceFiles/data/data_forum_topic.h b/Telegram/SourceFiles/data/data_forum_topic.h
index 275f38fcbf8fa..06423e47505b2 100644
--- a/Telegram/SourceFiles/data/data_forum_topic.h
+++ b/Telegram/SourceFiles/data/data_forum_topic.h
@@ -48,12 +48,33 @@ class Forum;
 	const style::ForumTopicIcon &st);
 [[nodiscard]] QImage ForumTopicGeneralIconFrame(
 	int size,
-	const style::color &color);
+	const QColor &color);
 [[nodiscard]] TextWithEntities ForumTopicIconWithTitle(
 	MsgId rootId,
 	DocumentId iconId,
 	const QString &title);
 
+[[nodiscard]] QString ForumGeneralIconTitle();
+[[nodiscard]] bool IsForumGeneralIconTitle(const QString &title);
+[[nodiscard]] int32 ForumGeneralIconColor(const QColor &color);
+[[nodiscard]] QColor ParseForumGeneralIconColor(int32 value);
+
+struct TopicIconDescriptor {
+	QString title;
+	int32 colorId = 0;
+
+	[[nodiscard]] bool empty() const {
+		return !colorId && title.isEmpty();
+	}
+	explicit operator bool() const {
+		return !empty();
+	}
+};
+
+[[nodiscard]] QString TopicIconEmojiEntity(TopicIconDescriptor descriptor);
+[[nodiscard]] TopicIconDescriptor ParseTopicIconEmojiEntity(
+	QStringView entity);
+
 class ForumTopic final : public Thread {
 public:
 	static constexpr auto kGeneralId = 1;
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index 22b877fb9dc7f..7f110b6b1d517 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "data/stickers/data_custom_emoji.h"
 
+#include "boxes/peers/edit_forum_topic_box.h" // MakeTopicIconEmoji.
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
@@ -15,6 +16,7 @@ For license and copyright information please follow this link:
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_file_origin.h"
+#include "data/data_forum_topic.h" // ParseTopicIconEmojiEntity.
 #include "data/data_peer.h"
 #include "data/data_message_reactions.h"
 #include "data/stickers/data_stickers.h"
@@ -539,6 +541,8 @@ std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::create(
 		const auto ratio = style::DevicePixelRatio();
 		const auto size = EmojiSizeFromTag(tag) / ratio;
 		return userpic(data, std::move(update), size);
+	} else if (const auto parsed = Data::ParseTopicIconEmojiEntity(data)) {
+		return MakeTopicIconEmoji(parsed, std::move(update));
 	}
 	const auto parsed = ParseCustomEmojiData(data);
 	return parsed
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index a08c16119e2e2..15624e29dd9db 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "base/qt/qt_key_modifiers.h"
 #include "base/options.h"
+#include "dialogs/ui/chat_search_tabs.h"
 #include "dialogs/ui/dialogs_stories_content.h"
 #include "dialogs/ui/dialogs_stories_list.h"
 #include "dialogs/ui/dialogs_suggestions.h"
@@ -23,6 +24,7 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_requests_bar.h"
 #include "history/view/history_view_group_call_bar.h"
 #include "boxes/peers/edit_peer_requests_box.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/fields/input_field.h"
@@ -62,6 +64,7 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_user.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
@@ -1075,6 +1078,9 @@ void Widget::updateControlsVisibility(bool fast) {
 		updateJumpToDateVisibility(fast);
 		updateSearchFromVisibility(fast);
 	}
+	if (_searchTabs) {
+		_searchTabs->show();
+	}
 	if (_connecting) {
 		_connecting->setForceHidden(false);
 	}
@@ -1218,6 +1224,114 @@ void Widget::updateSuggestions(anim::type animated) {
 	}
 }
 
+void Widget::updateSearchTabs() {
+	const auto has = _searchInChat
+		|| _hiddenSearchInChat
+		|| _searchingHashtag;
+	if (!has) {
+		_searchTab = ChatSearchTab::MyMessages;
+		if (_searchTabs) {
+			_searchTabs = nullptr;
+			updateControlsGeometry();
+		}
+		return;
+	} else if (!_searchTabs) {
+		_searchTabs = std::make_unique<ChatSearchTabs>(this, _searchTab);
+		_searchTabs->setVisible(!_showAnimation);
+		_searchTabs->tabChanges(
+		) | rpl::start_with_next([=](ChatSearchTab tab) {
+			if (_searchTab != tab) {
+				_searchTab = tab;
+				applySearchTab();
+			}
+		}, _searchTabs->lifetime());
+	}
+	const auto topic = _searchInChat.topic()
+		? _searchInChat.topic()
+		: _hiddenSearchInChat.topic();
+	const auto peer = _searchInChat.owningHistory()
+		? _searchInChat.owningHistory()->peer.get()
+		: _hiddenSearchInChat.owningHistory()
+		? _hiddenSearchInChat.owningHistory()->peer.get()
+		: nullptr;
+	const auto topicShortLabel = topic
+		? Ui::Text::SingleCustomEmoji(Data::TopicIconEmojiEntity({
+			.title = (topic->isGeneral()
+				? Data::ForumGeneralIconTitle()
+				: topic->title()),
+			.colorId = (topic->isGeneral()
+				? Data::ForumGeneralIconColor(st::windowSubTextFg->c)
+				: topic->colorId()),
+			}))
+		: TextWithEntities();
+	const auto peerShortLabel = peer
+		? Ui::Text::SingleCustomEmoji(
+			session().data().customEmojiManager().peerUserpicEmojiData(
+				peer))
+		: TextWithEntities();
+	const auto myShortLabel = DefaultShortLabel(ChatSearchTab::MyMessages);
+	const auto publicShortLabel = _searchingHashtag
+		? DefaultShortLabel(ChatSearchTab::PublicPosts)
+		: TextWithEntities();
+	_searchTab = _searchInChat.topic()
+		? ChatSearchTab::ThisTopic
+		: _searchInChat.owningHistory()
+		? ChatSearchTab::ThisPeer
+		: (_searchingHashtag && _searchTab == ChatSearchTab::PublicPosts)
+		? ChatSearchTab::PublicPosts
+		: ChatSearchTab::MyMessages;
+	_searchTabs->setTabShortLabels({
+		{ ChatSearchTab::ThisTopic, topicShortLabel },
+		{ ChatSearchTab::ThisPeer, peerShortLabel },
+		{ ChatSearchTab::MyMessages, myShortLabel },
+		{ ChatSearchTab::PublicPosts, publicShortLabel },
+	}, _searchTab);
+
+	updateControlsGeometry();
+}
+
+void Widget::applySearchTab() {
+	switch (_searchTab) {
+	case ChatSearchTab::ThisTopic:
+		if (_searchInChat.topic()) {
+		} else if (_hiddenSearchInChat.topic()) {
+			setSearchInChat(
+				base::take(_hiddenSearchInChat),
+				base::take(_hiddenSearchFromAuthor),
+				base::take(_hiddenSearchTags));
+		} else {
+			updateSearchTabs();
+		}
+	case ChatSearchTab::ThisPeer:
+		if (_searchInChat.topic()) {
+			_hiddenSearchInChat = _searchInChat;
+			_hiddenSearchFromAuthor = _searchFromAuthor;
+			_hiddenSearchTags = _searchTags;
+			setSearchInChat(
+				_searchInChat.owningHistory(),
+				_searchFromAuthor,
+				_searchTags);
+		} else if (_searchInChat) {
+			return;
+		} else if (_hiddenSearchInChat) {
+			setSearchInChat(
+				_hiddenSearchInChat.owningHistory(),
+				_hiddenSearchFromAuthor,
+				_hiddenSearchTags);
+		}
+	case ChatSearchTab::MyMessages:
+		if (_searchInChat) {
+			_hiddenSearchInChat = (_hiddenSearchInChat.topic()
+				&& _hiddenSearchInChat.owningHistory() == _searchInChat.history())
+				? _hiddenSearchInChat
+				: _searchInChat;
+			_hiddenSearchFromAuthor = _searchFromAuthor;
+			_hiddenSearchTags = _searchTags;
+			setSearchInChat({});
+		}
+	}
+}
+
 void Widget::changeOpenedSubsection(
 		FnMut<void()> change,
 		bool fromRight,
@@ -2619,8 +2733,31 @@ void Widget::updateCancelSearch() {
 	_cancelSearch->toggle(shown, anim::type::normal);
 }
 
+bool Widget::fixSearchQuery() {
+	if (_fixingSearchQuery) {
+		return false;
+	}
+	_fixingSearchQuery = true;
+	const auto query = _search->getLastText();
+	if (_searchTab == ChatSearchTab::PublicPosts) {
+		const auto fixed = FixHashtagSearchQuery(
+			query,
+			_search->textCursor().position());
+		if (fixed.text != query) {
+			_search->setText(fixed.text);
+			_search->setCursorPosition(fixed.cursorPosition);
+		}
+		_searchingHashtag = true;
+	} else if (_searchingHashtag != IsHashtagSearchQuery(query)) {
+		_searchingHashtag = !_searchingHashtag;
+		updateSearchTabs();
+	}
+	_fixingSearchQuery = false;
+	return true;
+}
+
 void Widget::applySearchUpdate(bool force) {
-	if (_showAnimation && !force) {
+	if (!fixSearchQuery() || (_showAnimation && !force)) {
 		return;
 	}
 
@@ -2852,8 +2989,17 @@ bool Widget::setSearchInChat(
 	}
 	if (searchInPeerUpdated) {
 		_searchInChat = chat;
+		if (chat) {
+			_hiddenSearchFromAuthor = {};
+			_hiddenSearchTags = {};
+			const auto hiddenTopic = _hiddenSearchInChat.topic();
+			if (!hiddenTopic || hiddenTopic->history() != chat.history()) {
+				_hiddenSearchInChat = {};
+			}
+		}
 		controller()->setSearchInChat(_searchInChat);
 		updateSuggestions(anim::type::instant);
+		updateSearchTabs();
 		updateJumpToDateVisibility();
 		updateStoriesVisibility();
 	}
@@ -3190,6 +3336,9 @@ void Widget::updateControlsGeometry() {
 	if (_forumRequestsBar) {
 		_forumRequestsBar->resizeToWidth(barw);
 	}
+	if (_searchTabs) {
+		_searchTabs->resizeToWidth(barw);
+	}
 	_updateScrollGeometryCached = [=] {
 		const auto moreChatsBarTop = expandedStoriesTop
 			+ ((!_stories || _stories->isHidden()) ? 0 : _aboveScrollAdded);
@@ -3211,8 +3360,13 @@ void Widget::updateControlsGeometry() {
 		if (_forumReportBar) {
 			_forumReportBar->bar().move(0, forumReportTop);
 		}
-		const auto scrollTop = forumReportTop
+		const auto searchTabsTop = forumReportTop
 			+ (_forumReportBar ? _forumReportBar->bar().height() : 0);
+		if (_searchTabs) {
+			_searchTabs->move(0, searchTabsTop);
+		}
+		const auto scrollTop = searchTabsTop
+			+ (_searchTabs ? _searchTabs->height() : 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 b183cb36fded2..a1bc0e4eae9bd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -76,6 +76,8 @@ struct ChosenRow;
 class InnerWidget;
 enum class SearchRequestType;
 class Suggestions;
+class ChatSearchTabs;
+enum class ChatSearchTab : uchar;
 
 class Widget final : public Window::AbstractSectionWidget {
 public:
@@ -225,6 +227,7 @@ class Widget final : public Window::AbstractSectionWidget {
 		QPixmap newContentCache,
 		Window::SlideDirection direction);
 
+	void applySearchTab();
 	void openChildList(
 		not_null<Data::Forum*> forum,
 		const Window::SectionShow &params);
@@ -232,6 +235,7 @@ class Widget final : public Window::AbstractSectionWidget {
 
 	void fullSearchRefreshOn(rpl::producer<> events);
 	void updateCancelSearch();
+	bool fixSearchQuery();
 	void applySearchUpdate(bool force = false);
 	void refreshLoadMoreButton(bool mayBlock, bool isBlocked);
 	void loadMoreBlockedByDate();
@@ -251,6 +255,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	void updateScrollUpPosition();
 	void updateLockUnlockPosition();
 	void updateSuggestions(anim::type animated);
+	void updateSearchTabs();
 	void processSearchFocusChange();
 
 	[[nodiscard]] bool redirectToSearchPossible() const;
@@ -289,6 +294,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	QPointer<InnerWidget> _inner;
 	std::unique_ptr<Suggestions> _suggestions;
 	std::vector<std::unique_ptr<Suggestions>> _hidingSuggestions;
+	std::unique_ptr<ChatSearchTabs> _searchTabs;
 	class BottomButton;
 	object_ptr<BottomButton> _updateTelegram = { nullptr };
 	object_ptr<BottomButton> _loadMoreChats = { nullptr };
@@ -304,6 +310,9 @@ class Widget final : public Window::AbstractSectionWidget {
 	object_ptr<Ui::JumpDownButton> _scrollToTop;
 	bool _scrollToTopIsShown = false;
 	bool _forumSearchRequested = false;
+	bool _fixingSearchQuery = false;
+	bool _searchingHashtag = false;
+	ChatSearchTab _searchTab = ChatSearchTab();
 
 	Data::Folder *_openedFolder = nullptr;
 	Data::Forum *_openedForum = nullptr;
@@ -316,6 +325,10 @@ class Widget final : public Window::AbstractSectionWidget {
 	bool _searchSuggestionsLocked = false;
 	bool _searchHasFocus = false;
 
+	Key _hiddenSearchInChat;
+	PeerData *_hiddenSearchFromAuthor = nullptr;
+	std::vector<Data::ReactionId> _hiddenSearchTags;
+
 	rpl::event_stream<rpl::producer<Stories::Content>> _storiesContents;
 	base::flat_map<PeerId, Ui::PeerUserpicView> _storiesUserpicsViewsHidden;
 	base::flat_map<PeerId, Ui::PeerUserpicView> _storiesUserpicsViewsShown;
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
new file mode 100644
index 0000000000000..456183d304d69
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
@@ -0,0 +1,178 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/ui/chat_search_tabs.h"
+
+#include "lang/lang_keys.h"
+#include "ui/widgets/discrete_sliders.h"
+#include "ui/widgets/shadow.h"
+#include "styles/style_dialogs.h"
+
+namespace Dialogs {
+namespace {
+
+[[nodiscard]] QString TabLabel(
+		ChatSearchTab tab,
+		ChatSearchPeerTabType type = {}) {
+	switch (tab) {
+	case ChatSearchTab::MyMessages:
+		return tr::lng_search_tab_my_messages(tr::now);
+	case ChatSearchTab::ThisTopic:
+		return tr::lng_search_tab_this_topic(tr::now);
+	case ChatSearchTab::ThisPeer:
+		switch (type) {
+		case ChatSearchPeerTabType::Chat:
+			return tr::lng_search_tab_this_chat(tr::now);
+		case ChatSearchPeerTabType::Channel:
+			return tr::lng_search_tab_this_channel(tr::now);
+		case ChatSearchPeerTabType::Group:
+			return tr::lng_search_tab_this_group(tr::now);
+		}
+		Unexpected("Type in Dialogs::TabLabel.");
+	case ChatSearchTab::PublicPosts:
+		return tr::lng_search_tab_public_posts(tr::now);
+	}
+	Unexpected("Tab in Dialogs::TabLabel.");
+}
+
+} // namespace
+
+TextWithEntities DefaultShortLabel(ChatSearchTab tab) {
+	// Return them in QString::fromUtf8 format.
+	switch (tab) {
+	case ChatSearchTab::MyMessages:
+		return { QString::fromUtf8("\xf0\x9f\x93\xa8") };
+	case ChatSearchTab::PublicPosts:
+		return { QString::fromUtf8("\xf0\x9f\x8c\x8e") };
+	}
+	Unexpected("Tab in Dialogs::DefaultShortLabel.");
+}
+
+FixedHashtagSearchQuery FixHashtagSearchQuery(
+		const QString &query,
+		int cursorPosition) {
+	const auto trimmed = query.trimmed();
+	const auto hash = trimmed.isEmpty()
+		? query.size()
+		: query.indexOf(trimmed);
+	const auto start = std::min(cursorPosition, hash);
+	auto result = query.mid(0, start);
+	for (const auto &ch : query.mid(start)) {
+		if (ch.isSpace()) {
+			if (cursorPosition > result.size()) {
+				--cursorPosition;
+			}
+			continue;
+		} else if (result.size() == start) {
+			result += '#';
+			if (ch != '#') {
+				++cursorPosition;
+			}
+		}
+		if (ch != '#') {
+			result += ch;
+		}
+	}
+	return { result, cursorPosition };
+}
+
+bool IsHashtagSearchQuery(const QString &query) {
+	const auto trimmed = query.trimmed();
+	if (trimmed.isEmpty() || trimmed[0] != '#') {
+		return false;
+	}
+	for (const auto &ch : trimmed) {
+		if (ch.isSpace()) {
+			return false;
+		}
+	}
+	return true;
+}
+
+ChatSearchTabs::ChatSearchTabs(QWidget *parent, ChatSearchTab active)
+: RpWidget(parent)
+, _tabs(std::make_unique<Ui::SettingsSlider>(this, st::dialogsSearchTabs))
+, _shadow(std::make_unique<Ui::PlainShadow>(this))
+, _active(active) {
+	for (const auto tab : {
+		ChatSearchTab::ThisTopic,
+		ChatSearchTab::ThisPeer,
+		ChatSearchTab::MyMessages,
+		ChatSearchTab::PublicPosts,
+	}) {
+		_list.push_back({ tab, TabLabel(tab) });
+	}
+	_tabs->move(0, 0);
+	_tabs->sectionActivated(
+	) | rpl::start_with_next([=](int index) {
+		for (const auto &tab : _list) {
+			if (!index) {
+				_active = tab.value;
+				return;
+			}
+			if (!tab.shortLabel.empty()) {
+				--index;
+			}
+		}
+	}, lifetime());
+}
+
+ChatSearchTabs::~ChatSearchTabs() = default;
+
+void ChatSearchTabs::setPeerTabType(ChatSearchPeerTabType type) {
+	_type = type;
+	const auto i = ranges::find(_list, ChatSearchTab::ThisPeer, &Tab::value);
+	Assert(i != end(_list));
+	i->label = TabLabel(ChatSearchTab::ThisPeer, type);
+	if (!i->shortLabel.empty()) {
+		refreshTabs(_active.current());
+	}
+}
+
+void ChatSearchTabs::setTabShortLabels(
+		std::vector<ShortLabel> labels,
+		ChatSearchTab active) {
+	for (const auto &label : labels) {
+		const auto i = ranges::find(_list, label.tab, &Tab::value);
+		Assert(i != end(_list));
+		i->shortLabel = std::move(label.label);
+	}
+	refreshTabs(active);
+}
+
+rpl::producer<ChatSearchTab> ChatSearchTabs::tabChanges() const {
+	return _active.changes();
+}
+
+void ChatSearchTabs::refreshTabs(ChatSearchTab active) {
+	auto index = 0;
+	auto labels = std::vector<QString>();
+	for (const auto &tab : _list) {
+		if (tab.value == active) {
+			index = int(labels.size());
+			Assert(!tab.shortLabel.empty());
+			labels.push_back(tab.label);
+		} else if (!tab.shortLabel.empty()) {
+			labels.push_back(tab.label);
+		}
+	}
+	_tabs->setSections(labels);
+	_tabs->setActiveSectionFast(index);
+	resizeToWidth(width());
+}
+
+int ChatSearchTabs::resizeGetHeight(int newWidth) {
+	_tabs->resizeToWidth(newWidth);
+	_shadow->setGeometry(
+		_tabs->x(),
+		_tabs->y() + _tabs->height() - st::lineWidth,
+		_tabs->width(),
+		st::lineWidth);
+	return _tabs->height();
+}
+
+} // namespace Dialogs
\ No newline at end of file
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h
new file mode 100644
index 0000000000000..0e2640f834b5d
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h
@@ -0,0 +1,83 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+
+namespace Ui {
+class SettingsSlider;
+class PlainShadow;
+} // namespace Ui
+
+namespace Dialogs {
+
+enum class ChatSearchTab : uchar {
+	MyMessages,
+	ThisTopic,
+	ThisPeer,
+	PublicPosts,
+};
+
+enum class ChatSearchPeerTabType : uchar {
+	Chat,
+	Channel,
+	Group,
+};
+
+// Available for MyMessages and PublicPosts.
+[[nodiscard]] TextWithEntities DefaultShortLabel(ChatSearchTab tab);
+
+class ChatSearchTabs final : public Ui::RpWidget {
+public:
+	ChatSearchTabs(QWidget *parent, ChatSearchTab active);
+	~ChatSearchTabs();
+
+	void setPeerTabType(ChatSearchPeerTabType type);
+
+	// A [custom] emoji to use when there is not enough space for text.
+	// Only tabs with available short labels are shown.
+	struct ShortLabel {
+		ChatSearchTab tab = {};
+		TextWithEntities label;
+	};
+	void setTabShortLabels(
+		std::vector<ShortLabel> labels,
+		ChatSearchTab active);
+
+	[[nodiscard]] rpl::producer<ChatSearchTab> tabChanges() const;
+
+private:
+	struct Tab {
+		ChatSearchTab value = {};
+		QString label;
+		TextWithEntities shortLabel;
+	};
+
+	void refreshTabs(ChatSearchTab active);
+	int resizeGetHeight(int newWidth) override;
+
+	const std::unique_ptr<Ui::SettingsSlider> _tabs;
+	const std::unique_ptr<Ui::PlainShadow> _shadow;
+
+	std::vector<Tab> _list;
+	rpl::variable<ChatSearchTab> _active;
+	ChatSearchPeerTabType _type = {};
+
+};
+
+struct FixedHashtagSearchQuery {
+	QString text;
+	int cursorPosition = 0;
+};
+[[nodiscard]] FixedHashtagSearchQuery FixHashtagSearchQuery(
+	const QString &query,
+	int cursorPosition);
+
+[[nodiscard]] bool IsHashtagSearchQuery(const QString &query);
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index e460b4dc83d25..9d69f6738cf6f 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -211,7 +211,7 @@ void TopicIconView::setupImage(not_null<Data::ForumTopic*> topic) {
 		) | rpl::start_with_next([=] {
 			_image = ForumTopicGeneralIconFrame(
 				st::infoForumTopicIcon.size,
-				_generalIconFg);
+				_generalIconFg->c);
 			_update();
 		}, _lifetime);
 		return;
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index da2ea224d9c64..533fe85ef17d5 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -85,6 +85,8 @@ PRIVATE
     data/data_subscription_option.h
 
     dialogs/dialogs_three_state_icon.h
+    dialogs/ui/chat_search_tabs.cpp
+    dialogs/ui/chat_search_tabs.h
     dialogs/ui/dialogs_stories_list.cpp
     dialogs/ui/dialogs_stories_list.h
     dialogs/ui/top_peers_strip.cpp

From dd5643ac67512e6609094482f7931539158e9167 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 17 May 2024 14:56:56 +0400
Subject: [PATCH 193/400] Start chats search rewrite.

---
 .../dialogs/dialogs_inner_widget.cpp          | 134 +---
 .../dialogs/dialogs_inner_widget.h            |  10 +-
 Telegram/SourceFiles/dialogs/dialogs_key.cpp  |  18 +
 Telegram/SourceFiles/dialogs/dialogs_key.h    |  29 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 708 +++++++++---------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  43 +-
 .../view/history_view_top_bar_widget.cpp      |  12 +-
 .../view/history_view_top_bar_widget.h        |   3 +-
 Telegram/SourceFiles/mainwidget.cpp           |  14 +-
 9 files changed, 477 insertions(+), 494 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 3c3ab74f6d86d..25cf71a969204 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -157,13 +157,11 @@ InnerWidget::InnerWidget(
 , _narrowWidth(st::defaultDialogRow.padding.left()
 	+ st::defaultDialogRow.photoSize
 	+ st::defaultDialogRow.padding.left())
-, _cancelSearchInChat(this, st::dialogsCancelSearchInPeer)
 , _cancelSearchFromUser(this, st::dialogsCancelSearchInPeer)
 , _chatPreviewTimer([=] { showChatPreview(true); })
 , _childListShown(std::move(childListShown)) {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 
-	_cancelSearchInChat->hide();
 	_cancelSearchFromUser->hide();
 
 	style::PaletteChanged(
@@ -509,13 +507,7 @@ int InnerWidget::searchInChatSkip() const {
 	if (_searchTags) {
 		result += _searchTags->height();
 	}
-	if (_searchInChat) {
-		result += st::searchedBarHeight + st::dialogsSearchInHeight;
-	}
 	if (_searchFromShown) {
-		if (_searchInChat) {
-			result += st::lineWidth;
-		}
 		result += st::dialogsSearchInHeight;
 	}
 	return result;
@@ -856,7 +848,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			}
 		}
 
-		if (_searchInChat || _searchFromPeer) {
+		if (_searchFromShown) {
 			paintSearchInChat(p, {
 				.st = &st::forumTopicRow,
 				.currentBg = currentBg(),
@@ -1141,37 +1133,8 @@ void InnerWidget::paintSearchInChat(
 		top += height;
 	}
 	p.setFont(st::searchedBarFont);
-	if (_searchInChat) {
-		const auto bar = st::searchedBarHeight;
-		p.fillRect(0, top, width(), top + bar, st::searchedBarBg);
-		p.setPen(st::searchedBarFg);
-		p.drawTextLeft(st::searchedBarPosition.x(), top + st::searchedBarPosition.y(), width(), tr::lng_dlg_search_in(tr::now));
-		top += bar;
-	}
 	auto fullRect = QRect(0, top, width(), height - top);
 	p.fillRect(fullRect, currentBg());
-	if (_searchInChat) {
-		if (_searchFromShown) {
-			p.fillRect(QRect(0, top + st::dialogsSearchInHeight, width(), st::lineWidth), st::shadowFg);
-		}
-		p.setPen(st::dialogsNameFg);
-		if (const auto topic = _searchInChat.topic()) {
-			paintSearchInTopic(p, context, topic, _searchInChatUserpic, top, _searchInChatText);
-		} else if (const auto peer = _searchInChat.peer()) {
-			if (peer->isSelf()) {
-				paintSearchInSaved(p, top, _searchInChatText);
-			} else if (peer->isRepliesChat()) {
-				paintSearchInReplies(p, top, _searchInChatText);
-			} else {
-				paintSearchInPeer(p, peer, _searchInChatUserpic, top, _searchInChatText);
-			}
-		} else if (const auto sublist = _searchInChat.sublist()) {
-			paintSearchInSaved(p, top, _searchInChatText);
-		} else {
-			Unexpected("Empty Key in paintSearchInChat.");
-		}
-		top += st::dialogsSearchInHeight + st::lineWidth;
-	}
 	if (_searchFromShown) {
 		p.setPen(st::dialogsTextFg);
 		p.setTextPalette(st::dialogsSearchFromPalette);
@@ -1930,12 +1893,10 @@ void InnerWidget::moveCancelSearchButtons() {
 	const auto widthForCancelButton = qMax(
 		width(),
 		st::columnMinimalWidthLeft - _narrowWidth);
-	const auto left = widthForCancelButton - st::dialogsSearchInSkip - _cancelSearchInChat->width();
+	const auto left = widthForCancelButton - st::dialogsSearchInSkip - _cancelSearchFromUser->width();
 	const auto top = (st::dialogsSearchInHeight - st::dialogsCancelSearchInPeer.height) / 2;
 	const auto skip = st::searchedBarHeight + (_searchTags ? _searchTags->height() : 0);
-	_cancelSearchInChat->moveToLeft(left, skip + top);
-	const auto next = _searchInChat ? (skip + st::dialogsSearchInHeight + st::lineWidth) : 0;
-	_cancelSearchFromUser->moveToLeft(left, next + top);
+	_cancelSearchFromUser->moveToLeft(left, skip + top);
 }
 
 void InnerWidget::dialogRowReplaced(
@@ -2334,7 +2295,7 @@ void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 	const auto folder = session().data().folderLoaded(Data::Folder::kId);
 	if (!folder
 		|| !folder->chatsList()->fullSize().current()
-		|| _searchInChat) {
+		|| _searchState.inChat) {
 		return;
 	}
 	const auto skip = session().settings().skipArchiveInSearch();
@@ -2491,17 +2452,26 @@ void InnerWidget::parentGeometryChanged() {
 	}
 }
 
-void InnerWidget::applyFilterUpdate(QString newFilter, bool force) {
+void InnerWidget::applySearchState(SearchState state) {
+	if (_searchState == state) {
+		return;
+	}
+	auto withSameQuery = state;
+	withSameQuery.query = _searchState.query;
+	const auto otherChanged = (_searchState != withSameQuery);
+
+	_searchState = std::move(state);
+	auto newFilter = _searchState.query;
 	const auto mentionsSearch = (newFilter == u"@"_q);
 	const auto words = mentionsSearch
 		? QStringList(newFilter)
 		: TextUtilities::PrepareSearchWords(newFilter);
 	newFilter = words.isEmpty() ? QString() : words.join(' ');
-	if (newFilter != _filter || force) {
+	if (newFilter != _filter || otherChanged) {
 		_filter = newFilter;
 		if (_filter.isEmpty()
-			&& !_searchFromPeer
-			&& _searchTagsSelected.empty()) {
+			&& !_searchState.fromPeer
+			&& _searchState.tags.empty()) {
 			clearFilter();
 		} else {
 			setState(WidgetState::Filtered);
@@ -2521,9 +2491,7 @@ void InnerWidget::applyFilterUpdate(QString newFilter, bool force) {
 					top += i->row->height();
 				}
 			};
-			if (!_searchInChat
-				&& !_searchFromPeer
-				&& !words.isEmpty()) {
+			if (_searchState.filterChatsList() && !words.isEmpty()) {
 				if (_savedSublists) {
 					const auto owner = &session().data();
 					append(owner->savedMessages().chatsList()->indexed());
@@ -2549,7 +2517,9 @@ void InnerWidget::applyFilterUpdate(QString newFilter, bool force) {
 }
 
 void InnerWidget::onHashtagFilterUpdate(QStringView newFilter) {
-	if (newFilter.isEmpty() || newFilter.at(0) != '#' || _searchInChat) {
+	if (newFilter.isEmpty()
+		|| newFilter.at(0) != '#'
+		|| _searchState.inChat) {
 		_hashtagFilter = QString();
 		if (!_hashtagResults.empty()) {
 			_hashtagResults.clear();
@@ -2751,10 +2721,6 @@ rpl::producer<> InnerWidget::searchMessages() const {
 	return _searchMessages.events();
 }
 
-rpl::producer<> InnerWidget::cancelSearchInChatRequests() const {
-	return _cancelSearchInChat->clicks() | rpl::to_empty;
-}
-
 rpl::producer<QString> InnerWidget::completeHashtagRequests() const {
 	return _completeHashtagRequests.events();
 }
@@ -2847,12 +2813,12 @@ void InnerWidget::searchReceived(
 	const auto isMigratedSearch = (type == SearchRequestType::MigratedFromStart)
 		|| (type == SearchRequestType::MigratedFromOffset);
 
-	const auto key = (!_openedForum || _searchInChat.topic())
-		? _searchInChat
+	const auto key = (!_openedForum || _searchState.inChat.topic())
+		? _searchState.inChat
 		: Key(_openedForum->history());
 	if (inject
-		&& (!_searchInChat
-			|| inject->history() == _searchInChat.history())) {
+		&& (!_searchState.inChat
+			|| inject->history() == _searchState.inChat.history())) {
 		Assert(_searchResults.empty());
 		const auto index = int(_searchResults.size());
 		_searchResults.push_back(
@@ -2984,7 +2950,7 @@ void InnerWidget::refresh(bool toTop) {
 		}
 	} else if (_state == WidgetState::Filtered) {
 		if (_waitingForSearch) {
-			h = searchedOffset() + (_searchResults.size() * _st->height) + ((_searchResults.empty() && !_searchInChat) ? -st::searchedBarHeight : 0);
+			h = searchedOffset() + (_searchResults.size() * _st->height) + ((_searchResults.empty() && !_searchState.inChat) ? -st::searchedBarHeight : 0);
 		} else {
 			h = searchedOffset() + (_searchResults.size() * _st->height);
 		}
@@ -3124,7 +3090,7 @@ void InnerWidget::searchInChat(
 
 			_searchTags->selectedChanges(
 			) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
-				_searchTagsSelected = std::move(list);
+				_searchState.tags = std::move(list);
 			}, _searchTags->lifetime());
 
 			_searchTags->repaintRequests() | rpl::start_with_next([=] {
@@ -3150,20 +3116,17 @@ void InnerWidget::searchInChat(
 			}, _searchTags->lifetime());
 		} else {
 			_searchTags = nullptr;
-			_searchTagsSelected.clear();
+			_searchState.tags.clear();
 		}
 	} else {
 		_searchTags = nullptr;
-		_searchTagsSelected.clear();
+		_searchState.tags.clear();
 	}
-	_searchInChat = key;
-	_searchFromPeer = from;
+	_searchState.inChat = key;
+	_searchState.fromPeer = from;
 	_searchFromShown = key.sublist() ? key.sublist()->peer().get() : from;
-	if (_searchInChat) {
+	if (_searchState.inChat) {
 		onHashtagFilterUpdate(QStringView());
-		_cancelSearchInChat->show();
-	} else {
-		_cancelSearchInChat->hide();
 	}
 	if (_searchFromShown) {
 		_cancelSearchFromUser->show();
@@ -3172,15 +3135,9 @@ void InnerWidget::searchInChat(
 		_cancelSearchFromUser->hide();
 		_searchFromUserUserpic = {};
 	}
-	if (_searchInChat || _searchFromPeer) {
+	if (_searchState.inChat || _searchState.fromPeer) {
 		refreshSearchInChatLabel();
 	}
-
-	if (peer) {
-		_searchInChatUserpic = peer->createUserpicView();
-	} else {
-		_searchInChatUserpic = {};
-	}
 	moveCancelSearchButtons();
 }
 
@@ -3192,27 +3149,6 @@ auto InnerWidget::searchTagsChanges() const
 }
 
 void InnerWidget::refreshSearchInChatLabel() {
-	const auto dialog = [&] {
-		if (const auto topic = _searchInChat.topic()) {
-			return topic->title();
-		} else if (const auto peer = _searchInChat.peer()) {
-			if (peer->isSelf()) {
-				return tr::lng_saved_messages(tr::now);
-			} else if (peer->isRepliesChat()) {
-				return tr::lng_replies_messages(tr::now);
-			}
-			return peer->name();
-		} else if (_searchInChat.sublist()) {
-			return tr::lng_saved_messages(tr::now);
-		}
-		return QString();
-	}();
-	if (!dialog.isEmpty()) {
-		_searchInChatText.setText(
-			st::semiboldTextStyle,
-			dialog,
-			Ui::DialogTextOptions());
-	}
 	const auto from = _searchFromShown ? _searchFromShown->name() : u""_q;
 	if (!from.isEmpty()) {
 		const auto fromUserText = tr::lng_dlg_search_from(
@@ -3236,8 +3172,8 @@ void InnerWidget::repaintSearchResult(int index) {
 }
 
 void InnerWidget::clearFilter() {
-	if (_state == WidgetState::Filtered || _searchInChat) {
-		if (_searchInChat) {
+	if (_state == WidgetState::Filtered || _searchState.inChat) {
+		if (_searchState.inChat) {
 			setState(WidgetState::Filtered);
 			_waitingForSearch = true;
 		} else {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index f78c220ade95f..805a7ff2b1aba 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -145,6 +145,7 @@ class InnerWidget final : public Ui::RpWidget {
 	}
 	[[nodiscard]] bool hasFilteredResults() const;
 
+	void applySearchState(SearchState state);
 	void searchInChat(
 		Key key,
 		PeerData *from,
@@ -152,7 +153,6 @@ class InnerWidget final : public Ui::RpWidget {
 	[[nodiscard]] auto searchTagsChanges() const
 		-> rpl::producer<std::vector<Data::ReactionId>>;
 
-	void applyFilterUpdate(QString newFilter, bool force = false);
 	void onHashtagFilterUpdate(QStringView newFilter);
 	void appendToFiltered(Key key);
 
@@ -169,7 +169,6 @@ class InnerWidget final : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<Ui::ScrollToRequest> mustScrollTo() const;
 	[[nodiscard]] rpl::producer<Ui::ScrollToRequest> dialogMoved() const;
 	[[nodiscard]] rpl::producer<> searchMessages() const;
-	[[nodiscard]] rpl::producer<> cancelSearchInChatRequests() const;
 	[[nodiscard]] rpl::producer<QString> completeHashtagRequests() const;
 	[[nodiscard]] rpl::producer<> refreshHashtagsRequests() const;
 
@@ -486,21 +485,16 @@ class InnerWidget final : public Ui::RpWidget {
 	WidgetState _state = WidgetState::Default;
 
 	object_ptr<Ui::FlatLabel> _empty = { nullptr };
-	object_ptr<Ui::IconButton> _cancelSearchInChat;
 	object_ptr<Ui::IconButton> _cancelSearchFromUser;
 
 	Ui::DraggingScrollManager _draggingScroll;
 
-	Key _searchInChat;
+	SearchState _searchState;
 	History *_searchInMigrated = nullptr;
-	PeerData *_searchFromPeer = nullptr;
 	PeerData *_searchFromShown = nullptr;
-	mutable Ui::PeerUserpicView _searchInChatUserpic;
 	mutable Ui::PeerUserpicView _searchFromUserUserpic;
-	Ui::Text::String _searchInChatText;
 	Ui::Text::String _searchFromUserText;
 	std::unique_ptr<SearchTags> _searchTags;
-	std::vector<Data::ReactionId> _searchTagsSelected;
 	int _searchTagsLeft = 0;
 	RowDescriptor _menuRow;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_key.cpp b/Telegram/SourceFiles/dialogs/dialogs_key.cpp
index dfa728141be16..263a605cc6d85 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_key.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_key.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "data/data_folder.h"
 #include "data/data_forum_topic.h"
 #include "data/data_saved_sublist.h"
+#include "dialogs/ui/chat_search_tabs.h"
 #include "history/history.h"
 
 namespace Dialogs {
@@ -84,4 +85,21 @@ PeerData *Key::peer() const {
 	return nullptr;
 }
 
+[[nodiscard]] bool SearchState::empty() const {
+	return !inChat
+		&& QStringView(query).trimmed().isEmpty();
+}
+
+ChatSearchTab SearchState::defaultTabForMe() const {
+	return inChat.topic()
+		? ChatSearchTab::ThisTopic
+		: inChat.history()
+		? ChatSearchTab::ThisPeer
+		: ChatSearchTab::MyMessages;
+}
+
+bool SearchState::filterChatsList() const {
+	return !inChat && (tab == ChatSearchTab::MyMessages);
+}
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_key.h b/Telegram/SourceFiles/dialogs/dialogs_key.h
index c43dc9f159051..a9278e08c7413 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_key.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_key.h
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/qt/qt_compare.h"
+
 class History;
 class PeerData;
 
@@ -15,11 +17,13 @@ class Thread;
 class Folder;
 class ForumTopic;
 class SavedSublist;
+struct ReactionId;
 } // namespace Data
 
 namespace Dialogs {
 
 class Entry;
+enum class ChatSearchTab : uchar;
 
 class Key {
 public:
@@ -120,4 +124,29 @@ struct EntryState {
 		= default;
 };
 
+struct SearchState {
+	Key inChat;
+	PeerData *fromPeer = nullptr;
+	std::vector<Data::ReactionId> tags;
+	ChatSearchTab tab = {};
+	QString query;
+
+	[[nodiscard]] bool empty() const;
+	[[nodiscard]] ChatSearchTab defaultTabForMe() const;
+	[[nodiscard]] bool filterChatsList() const;
+
+	explicit operator bool() const {
+		return !empty();
+	}
+
+	friend inline auto operator<=>(
+		const SearchState&,
+		const SearchState&) noexcept = default;
+	friend inline bool operator==(
+		const SearchState&,
+		const SearchState&) = default;
+};
+
+;
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 15624e29dd9db..cc510a9489c6f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -250,7 +250,7 @@ Widget::Widget(
 		st::dialogsStoriesList,
 		_storiesContents.events() | rpl::flatten_latest())
 	: nullptr)
-, _searchTimer([=] { searchMessages(); })
+, _searchTimer([=] { search(); })
 , _singleMessageSearch(&controller->session()) {
 	const auto makeChildListShown = [](PeerId peerId, float64 shown) {
 		return InnerWidget::ChildListShown{ peerId, shown };
@@ -325,11 +325,7 @@ Widget::Widget(
 	}, lifetime());
 	_inner->searchMessages(
 	) | rpl::start_with_next([=] {
-		needSearchMessages();
-	}, lifetime());
-	_inner->cancelSearchInChatRequests(
-	) | rpl::start_with_next([=] {
-		cancelSearchInChat();
+		searchRequested();
 	}, lifetime());
 	_inner->completeHashtagRequests(
 	) | rpl::start_with_next([=](const QString &tag) {
@@ -341,12 +337,12 @@ Widget::Widget(
 	}, lifetime());
 	_inner->cancelSearchFromUserRequests(
 	) | rpl::start_with_next([=] {
-		setSearchInChat((_openedForum && !_searchInChat)
-			? Key(_openedForum->history())
-			: _searchInChat.sublist()
-			? Key(session().data().history(session().user()))
-			: _searchInChat, nullptr);
-		applySearchUpdate(true);
+		auto copy = _searchState;
+		copy.fromPeer = nullptr;
+		if (copy.inChat.sublist()) {
+			copy.inChat = session().data().history(session().user());
+		}
+		applySearchState(std::move(copy));
 	}, lifetime());
 	_inner->chosenRow(
 	) | rpl::start_with_next([=](const ChosenRow &row) {
@@ -528,7 +524,7 @@ Widget::Widget(
 void Widget::chosenRow(const ChosenRow &row) {
 	storiesToggleExplicitExpand(false);
 
-	if (!_search->getLastText().isEmpty()) {
+	if (!currentSearchQuery().isEmpty()) {
 		if (const auto history = row.key.history()) {
 			session().recentPeers().bump(history->peer);
 		}
@@ -660,7 +656,7 @@ void Widget::setupMoreChatsBar() {
 	controller()->activeChatsFilter(
 	) | rpl::start_with_next([=](FilterId id) {
 		storiesToggleExplicitExpand(false);
-		if (!_searchInChat) {
+		if (!_searchState.inChat) {
 			cancelSearch();
 		}
 
@@ -1041,7 +1037,7 @@ void Widget::fullSearchRefreshOn(rpl::producer<> events) {
 		_searchQuery = QString();
 		_scroll->scrollToY(0);
 		cancelSearchRequest();
-		searchMessages();
+		search();
 	}, lifetime());
 }
 
@@ -1134,7 +1130,7 @@ void Widget::updateHasFocus(not_null<QWidget*> focused) {
 bool Widget::cancelSearchByMouseBack() {
 	return _searchHasFocus
 		&& !_searchSuggestionsLocked
-		&& !_searchInChat
+		&& !_searchState.inChat
 		&& cancelSearch();
 }
 
@@ -1147,7 +1143,7 @@ void Widget::processSearchFocusChange() {
 
 void Widget::updateSuggestions(anim::type animated) {
 	const auto suggest = (_searchHasFocus || _searchSuggestionsLocked)
-		&& !_searchInChat
+		&& !_searchState.inChat
 		&& (_inner->state() == WidgetState::Default);
 	if (anim::Disabled() || !session().data().chatsListLoaded()) {
 		animated = anim::type::instant;
@@ -1225,34 +1221,28 @@ void Widget::updateSuggestions(anim::type animated) {
 }
 
 void Widget::updateSearchTabs() {
-	const auto has = _searchInChat
-		|| _hiddenSearchInChat
-		|| _searchingHashtag;
+	const auto has = _searchState.inChat || _searchingHashtag;
 	if (!has) {
-		_searchTab = ChatSearchTab::MyMessages;
 		if (_searchTabs) {
 			_searchTabs = nullptr;
 			updateControlsGeometry();
 		}
 		return;
 	} else if (!_searchTabs) {
-		_searchTabs = std::make_unique<ChatSearchTabs>(this, _searchTab);
+		_searchTabs = std::make_unique<ChatSearchTabs>(
+			this,
+			_searchState.tab);
 		_searchTabs->setVisible(!_showAnimation);
 		_searchTabs->tabChanges(
 		) | rpl::start_with_next([=](ChatSearchTab tab) {
-			if (_searchTab != tab) {
-				_searchTab = tab;
-				applySearchTab();
-			}
+			auto copy = _searchState;
+			copy.tab = tab;
+			applySearchState(std::move(copy));
 		}, _searchTabs->lifetime());
 	}
-	const auto topic = _searchInChat.topic()
-		? _searchInChat.topic()
-		: _hiddenSearchInChat.topic();
-	const auto peer = _searchInChat.owningHistory()
-		? _searchInChat.owningHistory()->peer.get()
-		: _hiddenSearchInChat.owningHistory()
-		? _hiddenSearchInChat.owningHistory()->peer.get()
+	const auto topic = _searchState.inChat.topic();
+	const auto peer = _searchState.inChat.owningHistory()
+		? _searchState.inChat.owningHistory()->peer.get()
 		: nullptr;
 	const auto topicShortLabel = topic
 		? Ui::Text::SingleCustomEmoji(Data::TopicIconEmojiEntity({
@@ -1273,65 +1263,28 @@ void Widget::updateSearchTabs() {
 	const auto publicShortLabel = _searchingHashtag
 		? DefaultShortLabel(ChatSearchTab::PublicPosts)
 		: TextWithEntities();
-	_searchTab = _searchInChat.topic()
-		? ChatSearchTab::ThisTopic
-		: _searchInChat.owningHistory()
-		? ChatSearchTab::ThisPeer
-		: (_searchingHashtag && _searchTab == ChatSearchTab::PublicPosts)
-		? ChatSearchTab::PublicPosts
-		: ChatSearchTab::MyMessages;
+	if ((_searchState.tab == ChatSearchTab::ThisTopic
+		&& !_searchState.inChat.topic())
+		|| (_searchState.tab == ChatSearchTab::ThisPeer
+			&& !_searchState.inChat)
+		|| (_searchState.tab == ChatSearchTab::PublicPosts
+			&& !_searchingHashtag)) {
+		_searchState.tab = _searchState.inChat.topic()
+			? ChatSearchTab::ThisTopic
+			: _searchState.inChat.owningHistory()
+			? ChatSearchTab::ThisPeer
+			: ChatSearchTab::MyMessages;
+	}
 	_searchTabs->setTabShortLabels({
 		{ ChatSearchTab::ThisTopic, topicShortLabel },
 		{ ChatSearchTab::ThisPeer, peerShortLabel },
 		{ ChatSearchTab::MyMessages, myShortLabel },
 		{ ChatSearchTab::PublicPosts, publicShortLabel },
-	}, _searchTab);
+	}, _searchState.tab);
 
 	updateControlsGeometry();
 }
 
-void Widget::applySearchTab() {
-	switch (_searchTab) {
-	case ChatSearchTab::ThisTopic:
-		if (_searchInChat.topic()) {
-		} else if (_hiddenSearchInChat.topic()) {
-			setSearchInChat(
-				base::take(_hiddenSearchInChat),
-				base::take(_hiddenSearchFromAuthor),
-				base::take(_hiddenSearchTags));
-		} else {
-			updateSearchTabs();
-		}
-	case ChatSearchTab::ThisPeer:
-		if (_searchInChat.topic()) {
-			_hiddenSearchInChat = _searchInChat;
-			_hiddenSearchFromAuthor = _searchFromAuthor;
-			_hiddenSearchTags = _searchTags;
-			setSearchInChat(
-				_searchInChat.owningHistory(),
-				_searchFromAuthor,
-				_searchTags);
-		} else if (_searchInChat) {
-			return;
-		} else if (_hiddenSearchInChat) {
-			setSearchInChat(
-				_hiddenSearchInChat.owningHistory(),
-				_hiddenSearchFromAuthor,
-				_hiddenSearchTags);
-		}
-	case ChatSearchTab::MyMessages:
-		if (_searchInChat) {
-			_hiddenSearchInChat = (_hiddenSearchInChat.topic()
-				&& _hiddenSearchInChat.owningHistory() == _searchInChat.history())
-				? _hiddenSearchInChat
-				: _searchInChat;
-			_hiddenSearchFromAuthor = _searchFromAuthor;
-			_hiddenSearchTags = _searchTags;
-			setSearchInChat({});
-		}
-	}
-}
-
 void Widget::changeOpenedSubsection(
 		FnMut<void()> change,
 		bool fromRight,
@@ -1575,7 +1528,8 @@ void Widget::showSearchInTopBar(anim::type animated) {
 	_subsectionTopBar->toggleSearch(true, animated);
 	_subsectionTopBar->searchEnableChooseFromUser(
 		true,
-		!_searchFromAuthor);
+		!_searchState.fromPeer);
+	updateForceDisplayWide();
 }
 
 QPixmap Widget::grabForFolderSlideAnimation() {
@@ -1640,7 +1594,7 @@ void Widget::setInnerFocus(bool unfocusSearch) {
 		return;
 	} else if (!unfocusSearch
 		&& (!_search->getLastText().isEmpty()
-			|| _searchInChat
+			|| _searchState.inChat
 			|| _searchHasFocus
 			|| _searchSuggestionsLocked)) {
 		_search->setFocus();
@@ -1657,7 +1611,7 @@ void Widget::jumpToTop(bool belowPinned) {
 	if (session().supportMode()) {
 		return;
 	}
-	if ((currentSearchQuery().trimmed().isEmpty() && !_searchInChat)) {
+	if ((currentSearchQuery().trimmed().isEmpty() && !_searchState.inChat)) {
 		auto to = 0;
 		if (belowPinned) {
 			const auto list = _openedForum
@@ -1795,8 +1749,8 @@ void Widget::updateStoriesVisibility() {
 		|| _childList
 		|| _searchHasFocus
 		|| _searchSuggestionsLocked
-		|| !_search->getLastText().isEmpty()
-		|| _searchInChat
+		|| !currentSearchQuery().isEmpty()
+		|| _searchState.inChat
 		|| _stories->empty();
 	if (_stories->isHidden() != hidden) {
 		_stories->setVisible(!hidden);
@@ -1933,7 +1887,7 @@ void Widget::escape() {
 				controller()->setActiveChatsFilter(first);
 			}
 		}
-	} else if (!_searchInChat
+	} else if (!_searchState.inChat
 		&& controller()->activeChatEntryCurrent().key) {
 		controller()->content()->dialogsCancelled();
 	}
@@ -1953,7 +1907,7 @@ void Widget::submit() {
 		_inner->selectSkip(1);
 		_inner->chooseRow();
 	} else {
-		searchMessages();
+		search();
 	}
 }
 
@@ -1996,55 +1950,63 @@ void Widget::loadMoreBlockedByDate() {
 	session().api().requestMoreBlockedByDateDialogs();
 }
 
-bool Widget::searchMessages(bool searchCache) {
+bool Widget::search(bool inCache) {
 	auto result = false;
-	auto q = currentSearchQuery().trimmed();
-	if (q.isEmpty() && !_searchFromAuthor && _searchTags.empty()) {
+	const auto query = currentSearchQuery().trimmed();
+	const auto inPeer = searchInPeer();
+	const auto fromPeer = searchFromPeer();
+	const auto &inTags = searchInTags();
+	const auto tab = _searchState.tab;
+	const auto skipRequest = (query.isEmpty() && !fromPeer && inTags.empty())
+		|| (tab == ChatSearchTab::PublicPosts && query.size() < 2);
+	if (skipRequest) {
 		cancelSearchRequest();
 		_api.request(base::take(_peerSearchRequest)).cancel();
 		_api.request(base::take(_topicSearchRequest)).cancel();
 		return true;
-	}
-	if (searchCache) {
-		const auto success = _singleMessageSearch.lookup(q, [=] {
-			needSearchMessages();
+	} else if (inCache) {
+		const auto success = _singleMessageSearch.lookup(query, [=] {
+			searchRequested();
 		});
 		if (!success) {
 			return false;
 		}
-		const auto i = _searchCache.find(q);
+		const auto i = _searchCache.find(query);
 		if (i != _searchCache.end()) {
-			_searchQuery = q;
-			_searchQueryFrom = _searchFromAuthor;
-			_searchQueryTags = _searchTags;
+			_searchQuery = query;
+			_searchQueryFrom = fromPeer;
+			_searchQueryTags = inTags;
+			_searchQueryTab = tab;
 			_searchNextRate = 0;
 			_searchFull = _searchFullMigrated = false;
 			cancelSearchRequest();
 			searchReceived(
-				((_searchInChat || _openedForum)
+				(inPeer
 					? SearchRequestType::PeerFromStart
 					: SearchRequestType::FromStart),
 				i->second,
 				0);
 			result = true;
 		}
-	} else if (_searchQuery != q
-		|| _searchQueryFrom != _searchFromAuthor
-		|| _searchQueryTags != _searchTags) {
-		_searchQuery = q;
-		_searchQueryFrom = _searchFromAuthor;
-		_searchQueryTags = _searchTags;
+	} else if (_searchQuery != query
+		|| _searchQueryFrom != fromPeer
+		|| _searchQueryTags != inTags
+		|| _searchQueryTab != tab) {
+		_searchQuery = query;
+		_searchQueryFrom = fromPeer;
+		_searchQueryTags = inTags;
+		_searchQueryTab = tab;
 		_searchNextRate = 0;
 		_searchFull = _searchFullMigrated = false;
 		cancelSearchRequest();
-		if (const auto peer = searchInPeer()) {
+		if (inPeer) {
 			const auto topic = searchInTopic();
 			auto &histories = session().data().histories();
 			const auto type = Data::Histories::RequestType::History;
-			const auto history = session().data().history(peer);
+			const auto history = session().data().history(inPeer);
 			const auto sublist = _openedForum
 				? nullptr
-				: _searchInChat.sublist();
+				: _searchState.inChat.sublist();
 			const auto fromPeer = sublist ? nullptr : _searchQueryFrom;
 			const auto savedPeer = sublist
 				? sublist->peer().get()
@@ -2059,7 +2021,7 @@ bool Widget::searchMessages(bool searchCache) {
 						| (_searchQueryTags.empty()
 							? Flag()
 							: Flag::f_saved_reaction)),
-					peer->input,
+					inPeer->input,
 					MTP_string(_searchQuery),
 					(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
 					(savedPeer ? savedPeer->input : MTP_inputPeerEmpty()),
@@ -2089,6 +2051,20 @@ bool Widget::searchMessages(bool searchCache) {
 				_searchQueries.emplace(_searchRequest, _searchQuery);
 				return _searchRequest;
 			});
+		} 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);
 		} else {
 			const auto type = SearchRequestType::FromStart;
 			const auto flags = session().settings().skipArchiveInSearch()
@@ -2102,9 +2078,9 @@ bool Widget::searchMessages(bool searchCache) {
 				MTP_inputMessagesFilterEmpty(),
 				MTP_int(0), // min_date
 				MTP_int(0), // max_date
-				MTP_int(0),
-				MTP_inputPeerEmpty(),
-				MTP_int(0),
+				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);
@@ -2114,18 +2090,18 @@ bool Widget::searchMessages(bool searchCache) {
 			_searchQueries.emplace(_searchRequest, _searchQuery);
 		}
 	}
-	const auto query = Api::ConvertPeerSearchQuery(q);
-	if (searchForPeersRequired(query)) {
-		if (searchCache) {
-			auto i = _peerSearchCache.find(query);
+	const auto peerQuery = Api::ConvertPeerSearchQuery(query);
+	if (searchForPeersRequired(peerQuery)) {
+		if (inCache) {
+			auto i = _peerSearchCache.find(peerQuery);
 			if (i != _peerSearchCache.end()) {
-				_peerSearchQuery = query;
+				_peerSearchQuery = peerQuery;
 				_peerSearchRequest = 0;
 				peerSearchReceived(i->second, 0);
 				result = true;
 			}
-		} else if (_peerSearchQuery != query) {
-			_peerSearchQuery = query;
+		} else if (_peerSearchQuery != peerQuery) {
+			_peerSearchQuery = peerQuery;
 			_peerSearchFull = false;
 			_peerSearchRequest = _api.request(MTPcontacts_Search(
 				MTP_string(_peerSearchQuery),
@@ -2139,7 +2115,7 @@ bool Widget::searchMessages(bool searchCache) {
 		}
 	} else {
 		_api.request(base::take(_peerSearchRequest)).cancel();
-		_peerSearchQuery = query;
+		_peerSearchQuery = peerQuery;
 		_peerSearchFull = true;
 		peerSearchReceived(
 			MTP_contacts_found(
@@ -2149,45 +2125,41 @@ bool Widget::searchMessages(bool searchCache) {
 				MTP_vector<MTPUser>(0)),
 			0);
 	}
-	if (searchForTopicsRequired(query)) {
-		if (searchCache) {
-			if (_topicSearchQuery != query) {
+	if (searchForTopicsRequired(peerQuery)) {
+		if (inCache) {
+			if (_topicSearchQuery != peerQuery) {
 				result = false;
 			}
-		} else if (_topicSearchQuery != query) {
-			_topicSearchQuery = query;
+		} else if (_topicSearchQuery != peerQuery) {
+			_topicSearchQuery = peerQuery;
 			_topicSearchFull = false;
 			searchTopics();
 		}
 	} else {
 		_api.request(base::take(_topicSearchRequest)).cancel();
-		_topicSearchQuery = query;
+		_topicSearchQuery = peerQuery;
 		_topicSearchFull = true;
 	}
 	return result;
 }
 
 bool Widget::searchForPeersRequired(const QString &query) const {
-	return !_searchInChat
-		&& !_searchFromAuthor
-		&& _searchTags.empty()
+	return _searchState.filterChatsList()
 		&& !_openedForum
 		&& !query.isEmpty()
-		&& (query[0] != '#');
+		&& !IsHashtagSearchQuery(query);
 }
 
 bool Widget::searchForTopicsRequired(const QString &query) const {
-	return !_searchInChat
-		&& !_searchFromAuthor
-		&& _searchTags.empty()
+	return _searchState.filterChatsList()
 		&& _openedForum
 		&& !query.isEmpty()
-		&& (query[0] != '#')
+		&& !IsHashtagSearchQuery(query)
 		&& !_openedForum->topicsList()->loaded();
 }
 
-void Widget::needSearchMessages() {
-	if (!searchMessages(true)) {
+void Widget::searchRequested() {
+	if (!search(true)) {
 		_searchTimer.callOnce(AutoSearchTimeout);
 	}
 }
@@ -2196,63 +2168,66 @@ void Widget::showMainMenu() {
 	controller()->widget()->showMainMenu();
 }
 
-void Widget::searchMessages(QString query, Key inChat) {
-	if (_childList) {
-		const auto forum = controller()->shownForum().current();
-		const auto topic = inChat.topic();
-		if ((forum && forum->channel() == inChat.peer())
-			|| (topic && topic->forum() == forum)) {
-			_childList->searchMessages(query, inChat);
-			return;
-		}
-		hideChildList();
-	}
-	if (_openedFolder) {
-		controller()->closeFolder();
-	}
-
-	auto tags = Data::SearchTagsFromQuery(query);
-	if (!tags.empty()) {
-		if (!inChat.sublist()) {
-			inChat = session().data().history(session().user());
-		}
-		query = QString();
-	}
-	const auto inChatChanged = [&] {
-		const auto inPeer = inChat.peer();
-		const auto inTopic = inChat.topic();
-		if (!inTopic
-			&& _openedForum
-			&& inPeer == _openedForum->channel()
-			&& _subsectionTopBar
-			&& _subsectionTopBar->searchMode()) {
-			return false;
-		} else if ((inTopic || (inPeer && !inPeer->isForum()))
-			&& (inChat == _searchInChat)) {
-			return false;
-		} else if (inPeer) {
-			if (const auto to = inPeer->migrateTo()) {
-				if (to == _searchInChat.peer() && !_searchInChat.topic()) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}();
-	if ((currentSearchQuery() != query)
-		|| inChatChanged
-		|| _searchTags != tags) {
-		if (inChat) {
-			cancelSearch();
-			setSearchInChat(inChat, nullptr, tags);
-		}
-		setSearchQuery(query);
-		applySearchUpdate(true);
-		_searchTimer.cancel();
-		searchMessages();
-
-		session().local().saveRecentSearchHashtags(query);
-	}
+void Widget::searchMessages(SearchState state) {
+	applySearchState(std::move(state));
+	session().local().saveRecentSearchHashtags(state.query);
+	//if (_childList) {
+	//	const auto forum = controller()->shownForum().current();
+	//	const auto topic = inChat.topic();
+	//	if ((forum && forum->channel() == inChat.peer())
+	//		|| (topic && topic->forum() == forum)) {
+	//		_childList->searchMessages(query, inChat);
+	//		return;
+	//	}
+	//	hideChildList();
+	//}
+	//if (_openedFolder) {
+	//	controller()->closeFolder();
+	//}
+
+	//auto tags = Data::SearchTagsFromQuery(query);
+	//if (!tags.empty()) {
+	//	if (!inChat.sublist()) {
+	//		inChat = session().data().history(session().user());
+	//	}
+	//	query = QString();
+	//}
+	//const auto inChatChanged = [&] {
+	//	const auto inPeer = inChat.peer();
+	//	const auto inTopic = inChat.topic();
+	//	if (!inTopic
+	//		&& _openedForum
+	//		&& inPeer == _openedForum->channel()
+	//		&& _subsectionTopBar
+	//		&& _subsectionTopBar->searchMode()) {
+	//		return false;
+	//	} else if ((inTopic || (inPeer && !inPeer->isForum()))
+	//		&& (inChat == _searchState.inChat)) {
+	//		return false;
+	//	} else if (inPeer) {
+	//		if (const auto to = inPeer->migrateTo()) {
+	//			if (to == _searchState.inChat.peer()
+	//				&& !_searchState.inChat.topic()) {
+	//				return false;
+	//			}
+	//		}
+	//	}
+	//	return true;
+	//}();
+	//if ((currentSearchQuery() != query)
+	//	|| inChatChanged
+	//	|| _searchState.tags != tags) {
+	//	if (inChat) {
+	//		cancelSearch();
+	//		setSearchInChat(inChat, nullptr, tags);
+	//	}
+	//	setSearchQuery(query);
+	//	applySearchUpdate(true);
+	//	_searchTimer.cancel();
+	//	searchMessages();
+
+	//	session().local().saveRecentSearchHashtags(query);
+	//}
 }
 
 void Widget::searchTopics() {
@@ -2308,7 +2283,7 @@ void Widget::searchMore() {
 			const auto history = session().data().history(peer);
 			const auto sublist = _openedForum
 				? nullptr
-				: _searchInChat.sublist();
+				: _searchState.inChat.sublist();
 			const auto fromPeer = sublist ? nullptr : _searchQueryFrom;
 			const auto savedPeer = sublist
 				? sublist->peer().get()
@@ -2728,7 +2703,7 @@ void Widget::listScrollUpdated() {
 
 void Widget::updateCancelSearch() {
 	const auto shown = !_search->getLastText().isEmpty()
-		|| (!_searchInChat
+		|| (!_searchState.inChat
 			&& (_searchHasFocus || _searchSuggestionsLocked));
 	_cancelSearch->toggle(shown, anim::type::normal);
 }
@@ -2738,14 +2713,13 @@ bool Widget::fixSearchQuery() {
 		return false;
 	}
 	_fixingSearchQuery = true;
-	const auto query = _search->getLastText();
-	if (_searchTab == ChatSearchTab::PublicPosts) {
+	const auto query = currentSearchQuery();
+	if (_searchState.tab == ChatSearchTab::PublicPosts) {
 		const auto fixed = FixHashtagSearchQuery(
 			query,
-			_search->textCursor().position());
+			currentSearchQueryCursorPosition());
 		if (fixed.text != query) {
-			_search->setText(fixed.text);
-			_search->setCursorPosition(fixed.cursorPosition);
+			setSearchQuery(fixed.text, fixed.cursorPosition);
 		}
 		_searchingHashtag = true;
 	} else if (_searchingHashtag != IsHashtagSearchQuery(query)) {
@@ -2756,53 +2730,33 @@ bool Widget::fixSearchQuery() {
 	return true;
 }
 
-void Widget::applySearchUpdate(bool force) {
-	if (!fixSearchQuery() || (_showAnimation && !force)) {
+void Widget::applySearchUpdate() {
+	if (!fixSearchQuery()) {
 		return;
 	}
-
-	updateLockUnlockVisibility(anim::type::normal);
-	updateStoriesVisibility();
-	const auto filterText = currentSearchQuery();
-	_inner->applyFilterUpdate(filterText, force);
-	if (filterText.isEmpty() && !_searchFromAuthor && _searchTags.empty()) {
-		clearSearchCache();
-	}
-	updateCancelSearch();
-	if (!_postponeProcessSearchFocusChange) {
-		updateSuggestions(anim::type::instant);
-	}
-	updateLoadMoreChatsVisibility();
-	updateJumpToDateVisibility();
-	updateLockUnlockPosition();
-
-	if (filterText.isEmpty()) {
-		_peerSearchCache.clear();
-		for (const auto &[requestId, query] : base::take(_peerSearchQueries)) {
-			_api.request(requestId).cancel();
-		}
-		_peerSearchQuery = QString();
-	}
+	auto copy = _searchState;
+	copy.query = currentSearchQuery();
+	applySearchState(std::move(copy));
 
 	if (_chooseFromUser->toggled()
-		|| _searchFromAuthor
-		|| !_searchTags.empty()) {
+		|| _searchState.fromPeer
+		|| !_searchState.tags.empty()) {
 		auto switchToChooseFrom = HistoryView::SwitchToChooseFromQuery();
 		if (_lastSearchText != switchToChooseFrom
 			&& switchToChooseFrom.startsWith(_lastSearchText)
-			&& filterText == switchToChooseFrom) {
+			&& _searchState.query == switchToChooseFrom) {
 			showSearchFrom();
 		}
 	}
-	_lastSearchText = filterText;
-	updateForceDisplayWide();
+	_lastSearchText = _searchState.query;
 }
 
 void Widget::updateForceDisplayWide() {
 	controller()->setChatsForceDisplayWide(_searchHasFocus
+		|| (_subsectionTopBar && _subsectionTopBar->searchHasFocus())
 		|| _searchSuggestionsLocked
-		|| !_search->getLastText().isEmpty()
-		|| _searchInChat);
+		|| !currentSearchQuery().isEmpty()
+		|| _searchState.inChat);
 }
 
 void Widget::showForum(
@@ -2936,118 +2890,135 @@ void Widget::closeChildList(anim::type animated) {
 	updateStoriesVisibility();
 }
 
-void Widget::searchInChat(Key chat) {
-	searchMessages(QString(), chat);
-}
-
-bool Widget::setSearchInChat(
-		Key chat,
-		PeerData *from,
-		std::vector<Data::ReactionId> tags) {
-	if (_childList) {
-		if (_childList->setSearchInChat(chat, from, tags)) {
+bool Widget::applySearchState(SearchState state) {
+	if (_searchState == state) {
+		return true;
+	} else if (_childList) {
+		if (_childList->applySearchState(state)) {
 			return true;
 		}
 		hideChildList();
 	}
-	const auto peer = chat.peer();
-	const auto topic = chat.topic();
+
+	// Adjust state to be consistent.
+	if (const auto peer = state.inChat.peer()) {
+		if (const auto to = peer->migrateTo()) {
+			state.inChat = peer->owner().history(to);
+		}
+	}
+	const auto peer = state.inChat.peer();
+	const auto topic = state.inChat.topic();
 	const auto forum = peer ? peer->forum() : nullptr;
-	if (chat.folder() || (forum && !topic)) {
-		chat = Key();
+	if (state.inChat.folder() || (forum && !topic)) {
+		state.inChat = {};
+	}
+	if (!state.inChat && !forum) {
+		state.fromPeer = nullptr;
 	}
-	const auto searchInPeerUpdated = (_searchInChat != chat);
-	if (searchInPeerUpdated) {
-		from = nullptr;
-	} else if (!chat && !forum) {
-		from = nullptr;
+	if (state.tab == ChatSearchTab::PublicPosts
+		&& !IsHashtagSearchQuery(state.query)) {
+		state.tab = ChatSearchTab::MyMessages;
 	}
-	const auto searchFromUpdated = searchInPeerUpdated
-		|| (_searchFromAuthor != from);
-	_searchFromAuthor = from;
+	if (!state.tags.empty()) {
+		state.inChat = session().data().history(session().user());
+	}
+
+	const auto inChatChanged = (_searchState.inChat != state.inChat);
+	const auto fromPeerChanged = (_searchState.fromPeer != state.fromPeer);
+	const auto tagsChanged = (_searchState.tags != state.tags);
+	const auto queryChanged = (_searchState.query != state.query);
+	const auto tabChanged = (_searchState.tab != state.tab);
 
 	if (forum) {
 		if (_openedForum == forum) {
+			_searchState.fromPeer = state.fromPeer; // showSearchInTopBar
 			showSearchInTopBar(anim::type::normal);
 		} else if (_layout == Layout::Main) {
 			_forumSearchRequested = true;
+			_searchState.fromPeer = state.fromPeer; // showSearchInTopBar
 			controller()->showForum(forum);
 		} else {
 			return false;
 		}
+	} else if (peer && (_layout != Layout::Main)) {
+		return false;
 	}
-	_searchInMigrated = nullptr;
-	if (peer && !forum) {
-		if (_layout != Layout::Main) {
-			return false;
-		} else if (const auto migrateTo = peer->migrateTo()) {
-			const auto to = peer->owner().history(migrateTo);
-			return setSearchInChat(to, from, tags);
-		} else if (const auto migrateFrom = peer->migrateFrom()) {
-			_searchInMigrated = peer->owner().history(migrateFrom);
-		}
-	}
-	if (searchInPeerUpdated) {
-		_searchInChat = chat;
-		if (chat) {
-			_hiddenSearchFromAuthor = {};
-			_hiddenSearchTags = {};
-			const auto hiddenTopic = _hiddenSearchInChat.topic();
-			if (!hiddenTopic || hiddenTopic->history() != chat.history()) {
-				_hiddenSearchInChat = {};
-			}
-		}
-		controller()->setSearchInChat(_searchInChat);
-		updateSuggestions(anim::type::instant);
+
+	const auto migrateFrom = (peer && !topic)
+		? peer->migrateFrom()
+		: nullptr;
+	_searchInMigrated = migrateFrom
+		? peer->owner().history(migrateFrom).get()
+		: nullptr;
+	_searchState = state;
+	if (queryChanged) {
+		updateLockUnlockVisibility(anim::type::normal);
+		updateLoadMoreChatsVisibility();
+		updateCancelSearch();
+	}
+	if (inChatChanged) {
+		controller()->setSearchInChat(_searchState.inChat);
 		updateSearchTabs();
+	}
+	if (queryChanged || inChatChanged) {
 		updateJumpToDateVisibility();
 		updateStoriesVisibility();
 	}
-	if (searchFromUpdated) {
+	if (fromPeerChanged) {
 		updateSearchFromVisibility();
-		clearSearchCache();
 	}
 	updateLockUnlockPosition();
-	if (_searchInChat && _layout == Layout::Main) {
+
+	if ((state.query.isEmpty() && !state.fromPeer && state.tags.empty())
+		|| inChatChanged
+		|| fromPeerChanged
+		|| tagsChanged
+		|| tabChanged) {
+		clearSearchCache();
+	}
+	if (state.query.isEmpty()) {
+		_peerSearchCache.clear();
+		for (const auto &[requestId, query] : base::take(_peerSearchQueries)) {
+			_api.request(requestId).cancel();
+		}
+		_peerSearchQuery = QString();
+	}
+
+	if (_searchState.inChat && _layout == Layout::Main) {
 		controller()->closeFolder();
 	}
-	_searchTags = std::move(tags);
-	_inner->searchInChat(_searchInChat, _searchFromAuthor, _searchTags);
+
+	_inner->applySearchState(_searchState);
+
+	if (!_postponeProcessSearchFocusChange) {
+		// Suggestions depend on _inner->state(), not on _searchState.
+		updateSuggestions(anim::type::instant);
+	}
+
 	_searchTagsLifetime = _inner->searchTagsChanges(
 	) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
-		if (_searchTags != list) {
-			clearSearchCache();
-			_searchTags = std::move(list);
-			if (_searchTags.empty()) {
-				applySearchUpdate(true);
-			} else {
-				searchMessages();
-			}
-		}
+		auto copy = _searchState;
+		copy.tags = std::move(list);
+		applySearchState(std::move(copy));
 	});
 	if (_subsectionTopBar) {
 		_subsectionTopBar->searchEnableJumpToDate(
-			_openedForum && _searchInChat);
+			_openedForum && _searchState.inChat);
 	}
-	if (_searchFromAuthor
+	if (_searchState.fromPeer
 		&& _lastSearchText == HistoryView::SwitchToChooseFromQuery()) {
 		cancelSearch();
 	}
-	if (_searchInChat || !_search->getLastText().isEmpty()) {
+	if (_searchState.inChat || !_search->getLastText().isEmpty()) {
 		_search->setFocus();
 	} else {
-		setInnerFocus(true);
+		setInnerFocus();
 	}
 	updateForceDisplayWide();
+	applySearchUpdate();
 	return true;
 }
 
-bool Widget::setSearchInChat(
-		Key chat,
-		PeerData *from) {
-	return setSearchInChat(chat, from, {});
-}
-
 void Widget::clearSearchCache() {
 	_searchCache.clear();
 	_singleMessageSearch.clear();
@@ -3066,27 +3037,31 @@ void Widget::clearSearchCache() {
 }
 
 void Widget::showCalendar() {
-	if (_searchInChat) {
-		controller()->showCalendar(_searchInChat, QDate());
+	if (_searchState.inChat) {
+		controller()->showCalendar(_searchState.inChat, QDate());
 	}
 }
 
 void Widget::showSearchFrom() {
 	if (const auto peer = searchInPeer()) {
-		const auto weak = base::make_weak(_searchInChat.topic());
-		const auto chat = (!_searchInChat && _openedForum)
+		const auto weak = base::make_weak(_searchState.inChat.topic());
+		const auto chat = (!_searchState.inChat && _openedForum)
 			? Key(_openedForum->history())
-			: _searchInChat;
+			: _searchState.inChat;
 		auto box = SearchFromBox(
 			peer,
 			crl::guard(this, [=](not_null<PeerData*> from) {
 				controller()->hideLayer();
+				auto copy = _searchState;
 				if (!chat.topic()) {
-					setSearchInChat(chat, from);
+					copy.inChat = chat;
+					copy.fromPeer = from;
+					applySearchState(std::move(copy));
 				} else if (const auto strong = weak.get()) {
-					setSearchInChat(strong, from);
+					copy.inChat = strong;
+					copy.fromPeer = from;
+					applySearchState(std::move(copy));
 				}
-				applySearchUpdate(true);
 			}),
 			crl::guard(this, [=] { _search->setFocus(); }));
 		if (box) {
@@ -3132,9 +3107,8 @@ void Widget::completeHashtag(QString tag) {
 				}
 				if (cur - start - 1 == tag.size() && cur < t.size() && t.at(cur) == ' ') ++cur;
 				hashtag = t.mid(0, start + 1) + tag + ' ' + t.mid(cur);
-				_search->setText(hashtag);
-				_search->setCursorPosition(start + 1 + tag.size() + 1);
-				applySearchUpdate(true);
+				setSearchQuery(hashtag, start + 1 + tag.size() + 1);
+				applySearchUpdate();
 				return;
 			}
 			break;
@@ -3142,9 +3116,10 @@ void Widget::completeHashtag(QString tag) {
 			break;
 		}
 	}
-	_search->setText(t.mid(0, cur) + '#' + tag + ' ' + t.mid(cur));
-	_search->setCursorPosition(cur + 1 + tag.size() + 1);
-	applySearchUpdate(true);
+	setSearchQuery(
+		t.mid(0, cur) + '#' + tag + ' ' + t.mid(cur),
+		cur + 1 + tag.size() + 1);
+	applySearchUpdate();
 }
 
 void Widget::resizeEvent(QResizeEvent *e) {
@@ -3162,7 +3137,7 @@ void Widget::updateLockUnlockVisibility(anim::type animated) {
 		|| _childList
 		|| _searchHasFocus
 		|| _searchSuggestionsLocked
-		|| _searchInChat
+		|| _searchState.inChat
 		|| !_search->getLastText().isEmpty();
 	if (_lockUnlock->toggled() == hidden) {
 		const auto stories = _stories && !_stories->empty();
@@ -3195,7 +3170,7 @@ void Widget::updateJumpToDateVisibility(bool fast) {
 	}
 
 	_jumpToDate->toggle(
-		(_searchInChat && _search->getLastText().isEmpty()),
+		(_searchState.inChat && _search->getLastText().isEmpty()),
 		fast ? anim::type::instant : anim::type::normal);
 }
 
@@ -3203,7 +3178,7 @@ void Widget::updateSearchFromVisibility(bool fast) {
 	auto visible = [&] {
 		if (const auto peer = searchInPeer()) {
 			if (peer->isChat() || peer->isMegagroup()) {
-				return !_searchFromAuthor;
+				return !_searchState.fromPeer;
 			}
 		}
 		return false;
@@ -3427,7 +3402,7 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		//}
 	} else if ((e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Tab)
 		&& _searchHasFocus
-		&& !_searchInChat) {
+		&& !_searchState.inChat) {
 		escape();
 	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
 		submit();
@@ -3586,15 +3561,39 @@ void Widget::cancelSearchRequest() {
 }
 
 PeerData *Widget::searchInPeer() const {
-	return _openedForum
+	return (_searchState.tab == ChatSearchTab::MyMessages
+		|| _searchState.tab == ChatSearchTab::PublicPosts)
+		? nullptr
+		: _openedForum
 		? _openedForum->channel().get()
-		: _searchInChat.sublist()
+		: _searchState.inChat.sublist()
 		? session().user().get()
-		: _searchInChat.peer();
+		: _searchState.inChat.peer();
 }
 
 Data::ForumTopic *Widget::searchInTopic() const {
-	return _searchInChat.topic();
+	return (_searchState.tab != ChatSearchTab::ThisTopic)
+		? nullptr
+		: _searchState.inChat.topic();
+}
+
+PeerData *Widget::searchFromPeer() const {
+	if (const auto peer = searchInPeer()) {
+		if (peer->isChat() || peer->isMegagroup()) {
+			return _searchState.fromPeer;
+		}
+	}
+	return nullptr;
+}
+
+const std::vector<Data::ReactionId> &Widget::searchInTags() const {
+	if (const auto peer = searchInPeer()) {
+		if (peer->isSelf() && _searchState.tab == ChatSearchTab::ThisPeer) {
+			return _searchState.tags;
+		}
+	}
+	static const auto kEmpty = std::vector<Data::ReactionId>();
+	return kEmpty;
 }
 
 QString Widget::currentSearchQuery() const {
@@ -3603,6 +3602,12 @@ QString Widget::currentSearchQuery() const {
 		: _search->getLastText();
 }
 
+int Widget::currentSearchQueryCursorPosition() const {
+	return _subsectionTopBar
+		? _subsectionTopBar->searchQueryCursorPosition()
+		: _search->textCursor().position();
+}
+
 void Widget::clearSearchField() {
 	if (_subsectionTopBar) {
 		_subsectionTopBar->searchClear();
@@ -3611,28 +3616,36 @@ void Widget::clearSearchField() {
 	}
 }
 
-void Widget::setSearchQuery(const QString &query) {
+void Widget::setSearchQuery(const QString &query, int cursorPosition) {
+	if (cursorPosition < 0) {
+		cursorPosition = query.size();
+	}
 	if (_subsectionTopBar) {
-		_subsectionTopBar->searchSetText(query);
+		_subsectionTopBar->searchSetText(query, cursorPosition);
 	} else {
 		_search->setText(query);
+		_search->setCursorPosition(cursorPosition);
 	}
 }
 
 bool Widget::cancelSearch() {
-	auto clearingQuery = !currentSearchQuery().isEmpty();
-	auto clearingInChat = false;
 	cancelSearchRequest();
-	if (!clearingQuery && (_searchInChat || _searchFromAuthor)) {
-		if (_searchInChat && controller()->adaptive().isOneColumn()) {
-			if (const auto thread = _searchInChat.thread()) {
+	auto updatedState = _searchState;
+	const auto clearingQuery = !updatedState.query.isEmpty();
+	auto clearingInChat = !clearingQuery
+		&& (updatedState.inChat || updatedState.fromPeer);
+	if (clearingQuery) {
+		updatedState.query = QString();
+	} else if (clearingInChat) {
+		if (updatedState.inChat && controller()->adaptive().isOneColumn()) {
+			if (const auto thread = updatedState.inChat.thread()) {
 				controller()->showThread(thread);
 			} else {
 				Unexpected("Empty key in cancelSearch().");
 			}
 		}
-		setSearchInChat(Key());
-		clearingInChat = true;
+		updatedState.inChat = {};
+		updatedState.fromPeer = nullptr;
 	}
 	if (!clearingQuery
 		&& _subsectionTopBar
@@ -3640,9 +3653,9 @@ bool Widget::cancelSearch() {
 		setInnerFocus(true);
 		clearingInChat = true;
 	}
-	const auto clearSearchFocus = !_searchInChat
+	const auto clearSearchFocus = !updatedState.inChat
 		&& (_searchHasFocus || _searchSuggestionsLocked);
-	if (!_searchInChat && _suggestions) {
+	if (!updatedState.inChat && _suggestions) {
 		_suggestions->clearPersistance();
 		_searchSuggestionsLocked = false;
 	}
@@ -3654,32 +3667,13 @@ bool Widget::cancelSearch() {
 	_lastSearchId = _lastSearchMigratedId = 0;
 	_inner->clearFilter();
 	clearSearchField();
-	applySearchUpdate();
+	applySearchState(std::move(updatedState));
 	if (_suggestions && clearSearchFocus) {
 		setInnerFocus(true);
 	}
 	return clearingQuery || clearingInChat || clearSearchFocus;
 }
 
-void Widget::cancelSearchInChat() {
-	cancelSearchRequest();
-	const auto isOneColumn = controller()->adaptive().isOneColumn();
-	if (_searchInChat) {
-		if (isOneColumn && currentSearchQuery().trimmed().isEmpty()) {
-			if (const auto thread = _searchInChat.thread()) {
-				controller()->showThread(thread);
-			} else {
-				Unexpected("Empty key in cancelSearchInPeer().");
-			}
-		}
-		setSearchInChat(Key());
-	}
-	applySearchUpdate(true);
-	if (!isOneColumn && _search->getLastText().isEmpty()) {
-		controller()->content()->dialogsCancelled();
-	}
-}
-
 Widget::~Widget() {
 	cancelSearchRequest();
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index a1bc0e4eae9bd..f265ebf874771 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -100,7 +100,6 @@ class Widget final : public Window::AbstractSectionWidget {
 	void showForum(
 		not_null<Data::Forum*> forum,
 		const Window::SectionShow &params);
-	void searchInChat(Key chat);
 	void setInnerFocus(bool unfocusSearch = false);
 	[[nodiscard]] bool searchHasFocus() const;
 
@@ -122,9 +121,7 @@ class Widget final : public Window::AbstractSectionWidget {
 
 	void scrollToEntry(const RowDescriptor &entry);
 
-	void searchMessages(QString query, Key inChat = {});
-	void searchTopics();
-	void searchMore();
+	void searchMessages(SearchState state);
 
 	[[nodiscard]] RowDescriptor resolveChatNext(RowDescriptor from = {}) const;
 	[[nodiscard]] RowDescriptor resolveChatPrevious(RowDescriptor from = {}) const;
@@ -154,14 +151,16 @@ class Widget final : public Window::AbstractSectionWidget {
 private:
 	void chosenRow(const ChosenRow &row);
 	void listScrollUpdated();
-	void cancelSearchInChat();
 	void searchCursorMoved();
 	void completeHashtag(QString tag);
 
 	[[nodiscard]] QString currentSearchQuery() const;
+	[[nodiscard]] int currentSearchQueryCursorPosition() const;
 	void clearSearchField();
-	bool searchMessages(bool searchCache = false);
-	void needSearchMessages();
+	void searchRequested();
+	bool search(bool inCache = false);
+	void searchTopics();
+	void searchMore();
 
 	void slideFinished();
 	void searchReceived(
@@ -176,6 +175,8 @@ class Widget final : public Window::AbstractSectionWidget {
 	void cancelSearchRequest();
 	[[nodiscard]] PeerData *searchInPeer() const;
 	[[nodiscard]] Data::ForumTopic *searchInTopic() const;
+	[[nodiscard]] PeerData *searchFromPeer() const;
+	[[nodiscard]] const std::vector<Data::ReactionId> &searchInTags() const;
 
 	void setupSupportMode();
 	void setupConnectingWidget();
@@ -190,18 +191,15 @@ class Widget final : public Window::AbstractSectionWidget {
 	void trackScroll(not_null<Ui::RpWidget*> widget);
 	[[nodiscard]] bool searchForPeersRequired(const QString &query) const;
 	[[nodiscard]] bool searchForTopicsRequired(const QString &query) const;
-	bool setSearchInChat(
-		Key chat,
-		PeerData *from,
-		std::vector<Data::ReactionId> tags);
-	bool setSearchInChat(
-		Key chat,
-		PeerData *from = nullptr);
+
+	// Child list may be unable to set specific search state.
+	bool applySearchState(SearchState state);
+
 	void showCalendar();
 	void showSearchFrom();
 	void showMainMenu();
 	void clearSearchCache();
-	void setSearchQuery(const QString &query);
+	void setSearchQuery(const QString &query, int cursorPosition = -1);
 	void updateControlsVisibility(bool fast = false);
 	void updateLockUnlockVisibility(
 		anim::type animated = anim::type::instant);
@@ -227,7 +225,6 @@ class Widget final : public Window::AbstractSectionWidget {
 		QPixmap newContentCache,
 		Window::SlideDirection direction);
 
-	void applySearchTab();
 	void openChildList(
 		not_null<Data::Forum*> forum,
 		const Window::SectionShow &params);
@@ -236,7 +233,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	void fullSearchRefreshOn(rpl::producer<> events);
 	void updateCancelSearch();
 	bool fixSearchQuery();
-	void applySearchUpdate(bool force = false);
+	void applySearchUpdate();
 	void refreshLoadMoreButton(bool mayBlock, bool isBlocked);
 	void loadMoreBlockedByDate();
 
@@ -271,7 +268,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	Layout _layout = Layout::Main;
 	int _narrowWidth = 0;
 	object_ptr<Ui::RpWidget> _searchControls;
-	object_ptr<HistoryView::TopBarWidget> _subsectionTopBar = { nullptr } ;
+	object_ptr<HistoryView::TopBarWidget> _subsectionTopBar = { nullptr };
 	struct {
 		object_ptr<Ui::IconButton> toggle;
 		object_ptr<Ui::AbstractButton> under;
@@ -312,23 +309,16 @@ class Widget final : public Window::AbstractSectionWidget {
 	bool _forumSearchRequested = false;
 	bool _fixingSearchQuery = false;
 	bool _searchingHashtag = false;
-	ChatSearchTab _searchTab = ChatSearchTab();
 
 	Data::Folder *_openedFolder = nullptr;
 	Data::Forum *_openedForum = nullptr;
-	Key _searchInChat;
+	SearchState _searchState;
 	History *_searchInMigrated = nullptr;
-	PeerData *_searchFromAuthor = nullptr;
-	std::vector<Data::ReactionId> _searchTags;
 	rpl::lifetime _searchTagsLifetime;
 	QString _lastSearchText;
 	bool _searchSuggestionsLocked = false;
 	bool _searchHasFocus = false;
 
-	Key _hiddenSearchInChat;
-	PeerData *_hiddenSearchFromAuthor = nullptr;
-	std::vector<Data::ReactionId> _hiddenSearchTags;
-
 	rpl::event_stream<rpl::producer<Stories::Content>> _storiesContents;
 	base::flat_map<PeerId, Ui::PeerUserpicView> _storiesUserpicsViewsHidden;
 	base::flat_map<PeerId, Ui::PeerUserpicView> _storiesUserpicsViewsShown;
@@ -357,6 +347,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	QString _searchQuery;
 	PeerData *_searchQueryFrom = nullptr;
 	std::vector<Data::ReactionId> _searchQueryTags;
+	ChatSearchTab _searchQueryTab = {};
 	int32 _searchNextRate = 0;
 	bool _searchFull = false;
 	bool _searchFullMigrated = false;
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index 31764b970ff31..59a94d5850541 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -1412,15 +1412,25 @@ QString TopBarWidget::searchQueryCurrent() const {
 	return _searchQuery.current();
 }
 
+int TopBarWidget::searchQueryCursorPosition() const {
+	return _searchMode
+		? _searchField->textCursor().position()
+		: _searchQuery.current().size();
+}
+
 void TopBarWidget::searchClear() {
 	if (_searchMode) {
 		_searchField->clear();
 	}
 }
 
-void TopBarWidget::searchSetText(const QString &query) {
+void TopBarWidget::searchSetText(const QString &query, int cursorPosition) {
 	if (_searchMode) {
+		if (cursorPosition < 0) {
+			cursorPosition = query.size();
+		}
 		_searchField->setText(query);
+		_searchField->setCursorPosition(cursorPosition);
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
index 36d18a5f69f65..5c94220b1493c 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
@@ -88,8 +88,9 @@ class TopBarWidget final : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<> searchSubmitted() const;
 	[[nodiscard]] rpl::producer<QString> searchQuery() const;
 	[[nodiscard]] QString searchQueryCurrent() const;
+	[[nodiscard]] int searchQueryCursorPosition() const;
 	void searchClear();
-	void searchSetText(const QString &query);
+	void searchSetText(const QString &query, int cursorPosition = -1);
 
 	[[nodiscard]] rpl::producer<> forwardSelectionRequest() const {
 		return _forwardSelection.events();
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 5f94f8a22fefa..d3873d4f477aa 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -731,8 +731,18 @@ void MainWidget::hideSingleUseKeyboard(FullMsgId replyToId) {
 }
 
 void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
+	auto tags = Data::SearchTagsFromQuery(query);
 	if (controller()->isPrimary()) {
-		_dialogs->searchMessages(query, inChat);
+		using Tab = Dialogs::ChatSearchTab;
+		auto state = Dialogs::SearchState{
+			.inChat = ((tags.empty() || inChat.sublist())
+				? inChat
+				: session().data().history(session().user())),
+			.tags = tags,
+			.query = tags.empty() ? query : QString(),
+		};
+		state.tab = state.defaultTabForMe();
+		_dialogs->searchMessages(std::move(state));
 		if (isOneColumn()) {
 			_controller->clearSectionStack();
 		} else {
@@ -742,7 +752,7 @@ void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
 		if (const auto sublist = inChat.sublist()) {
 			controller()->showSection(
 				std::make_shared<HistoryView::SublistMemento>(sublist));
-		} else if (!Data::SearchTagsFromQuery(query).empty()) {
+		} else if (!tags.empty()) {
 			inChat = controller()->session().data().history(
 				controller()->session().user());
 		}

From 6a8edefc87c6e47e7c4e708782b4f794156fcbac Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 19 May 2024 12:05:32 +0400
Subject: [PATCH 194/400] Fix some bugs in new chats search.

---
 .../dialogs/dialogs_inner_widget.cpp          | 199 +++++++++---------
 .../dialogs/dialogs_inner_widget.h            |   5 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 177 ++++++----------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |   7 +-
 .../dialogs/ui/chat_search_tabs.cpp           |  24 ++-
 .../SourceFiles/dialogs/ui/chat_search_tabs.h |   7 +-
 6 files changed, 188 insertions(+), 231 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 25cf71a969204..ee71e46e7970c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "dialogs/dialogs_inner_widget.h"
 
 #include "dialogs/dialogs_three_state_icon.h"
+#include "dialogs/ui/chat_search_tabs.h"
 #include "dialogs/ui/dialogs_layout.h"
 #include "dialogs/ui/dialogs_stories_content.h"
 #include "dialogs/ui/dialogs_video_userpic.h"
@@ -747,6 +748,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			p.fillRect(dialogsClip, currentBg());
 		}
 	} else if (_state == WidgetState::Filtered) {
+		auto top = 0;
 		if (!_hashtagResults.empty()) {
 			auto from = floorclamp(r.y(), st::mentionHeight, 0, _hashtagResults.size());
 			auto to = ceilclamp(r.y() + r.height(), st::mentionHeight, 0, _hashtagResults.size());
@@ -791,6 +793,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 						p.drawText(htagleft + firstwidth, st::mentionTop + st::mentionFont->ascent, second);
 					}
 					p.translate(0, st::mentionHeight);
+					top += st::mentionHeight;
 				}
 			}
 		}
@@ -800,7 +803,9 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			auto to = std::min(
 				filteredIndex(r.y() + r.height() - skip) + 1,
 				int(_filterResults.size()));
-			p.translate(0, filteredHeight(from));
+			const auto height = filteredHeight(from);
+			p.translate(0, height);
+			top += height;
 			for (; from < to; ++from) {
 				const auto selected = isPressed()
 					? (from == _filteredPressed)
@@ -808,6 +813,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 				const auto row = _filterResults[from].row;
 				paintRow(row, selected, !activeEntry.fullId);
 				p.translate(0, row->height());
+				top += row->height();
 			}
 		}
 
@@ -817,11 +823,13 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			p.setPen(st::searchedBarFg);
 			p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), tr::lng_search_global_results(tr::now));
 			p.translate(0, st::searchedBarHeight);
+			top += st::searchedBarHeight;
 
 			auto skip = peerSearchOffset();
 			auto from = floorclamp(r.y() - skip, st::dialogsRowHeight, 0, _peerSearchResults.size());
 			auto to = ceilclamp(r.y() + r.height() - skip, st::dialogsRowHeight, 0, _peerSearchResults.size());
 			p.translate(0, from * st::dialogsRowHeight);
+			top += from * st::dialogsRowHeight;
 			if (from < _peerSearchResults.size()) {
 				const auto activePeer = activeEntry.key.peer();
 				for (; from < to; ++from) {
@@ -844,6 +852,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 						.paused = videoPaused,
 					});
 					p.translate(0, st::dialogsRowHeight);
+					top += st::dialogsRowHeight;
 				}
 			}
 		}
@@ -857,29 +866,15 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 				.paused = videoPaused,
 			});
 			p.translate(0, searchInChatSkip());
-			if (_waitingForSearch && _searchResults.empty()) {
-				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(),
-					tr::lng_dlg_search_for_messages(tr::now));
-				p.translate(0, st::searchedBarHeight);
+			top += searchInChatSkip();
+			if (_searchResults.empty()) {
+				p.fillRect(0, 0, fullWidth, st::lineWidth, st::shadowFg);
 			}
 		}
 
 		const auto showUnreadInSearchResults = uniqueSearchResults();
-		if (!_waitingForSearch || !_searchResults.empty()) {
-			const auto text = _searchResults.empty()
-				? tr::lng_search_no_results(tr::now)
-				: showUnreadInSearchResults
+		if (!_searchResults.empty()) {
+			const auto text = showUnreadInSearchResults
 				? u"Search results"_q
 				: tr::lng_search_found_results(
 					tr::now,
@@ -890,11 +885,13 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			p.setPen(st::searchedBarFg);
 			p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), text);
 			p.translate(0, st::searchedBarHeight);
+			top += st::searchedBarHeight;
 
 			auto skip = searchedOffset();
 			auto from = floorclamp(r.y() - skip, _st->height, 0, _searchResults.size());
 			auto to = ceilclamp(r.y() + r.height() - skip, _st->height, 0, _searchResults.size());
 			p.translate(0, from * _st->height);
+			top += from * _st->height;
 			if (from < _searchResults.size()) {
 				for (; from < to; ++from) {
 					const auto &result = _searchResults[from];
@@ -920,6 +917,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 						.displayUnreadInfo = showUnreadInSearchResults,
 					});
 					p.translate(0, _st->height);
+					top += _st->height;
 				}
 			}
 		}
@@ -1127,10 +1125,11 @@ void InnerWidget::paintSearchInChat(
 	auto top = 0;
 	if (_searchTags) {
 		const auto height = _searchTags->height();
+		top += st::dialogsSearchTagBottom;
 		p.fillRect(0, top, width(), height, currentBg());
-		const auto position = QPoint(_searchTagsLeft, 0);
+		const auto position = QPoint(_searchTagsLeft, top);
 		_searchTags->paint(p, position, context.now, context.paused);
-		top += height;
+		top += height - st::dialogsSearchTagBottom;
 	}
 	p.setFont(st::searchedBarFont);
 	auto fullRect = QRect(0, top, width(), height - top);
@@ -1279,7 +1278,9 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 	_lastMousePosition = globalPosition;
 	_lastRowLocalMouseX = local.x();
 
-	const auto tagBase = QPoint(_searchTagsLeft, searchInChatOffset());
+	const auto tagBase = QPoint(
+		_searchTagsLeft,
+		searchInChatOffset() + st::dialogsSearchTagBottom);
 	const auto tagPoint = local - tagBase;
 	const auto inTags = _searchTags
 		&& QRect(
@@ -1895,7 +1896,7 @@ void InnerWidget::moveCancelSearchButtons() {
 		st::columnMinimalWidthLeft - _narrowWidth);
 	const auto left = widthForCancelButton - st::dialogsSearchInSkip - _cancelSearchFromUser->width();
 	const auto top = (st::dialogsSearchInHeight - st::dialogsCancelSearchInPeer.height) / 2;
-	const auto skip = st::searchedBarHeight + (_searchTags ? _searchTags->height() : 0);
+	const auto skip = (_searchTags ? _searchTags->height() : 0);
 	_cancelSearchFromUser->moveToLeft(left, skip + top);
 }
 
@@ -2460,6 +2461,74 @@ void InnerWidget::applySearchState(SearchState state) {
 	withSameQuery.query = _searchState.query;
 	const auto otherChanged = (_searchState != withSameQuery);
 
+	const auto ignoreInChat = (state.tab == ChatSearchTab::MyMessages)
+		|| (state.tab == ChatSearchTab::PublicPosts);
+	const auto sublist = ignoreInChat ? nullptr : state.inChat.sublist();
+	const auto peer = ignoreInChat
+		? nullptr
+		: sublist
+		? session().user().get()
+		: state.inChat.peer();
+	if (const auto migrateFrom = peer ? peer->migrateFrom() : nullptr) {
+		_searchInMigrated = peer->owner().history(migrateFrom);
+	} else {
+		_searchInMigrated = nullptr;
+	}
+	if (peer && peer->isSelf()) {
+		const auto reactions = &peer->owner().reactions();
+		_searchTags = std::make_unique<SearchTags>(
+			&peer->owner(),
+			reactions->myTagsValue(sublist),
+			state.tags);
+
+		_searchTags->selectedChanges(
+		) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
+			_searchState.tags = std::move(list);
+		}, _searchTags->lifetime());
+
+		_searchTags->repaintRequests() | rpl::start_with_next([=] {
+			const auto height = _searchTags->height();
+			update(0, searchInChatOffset(), width(), height);
+		}, _searchTags->lifetime());
+
+		_searchTags->menuRequests(
+		) | rpl::start_with_next([=](Data::ReactionId id) {
+			HistoryView::ShowTagInListMenu(
+				&_menu,
+				_lastMousePosition.value_or(QCursor::pos()),
+				this,
+				id,
+				_controller);
+		}, _searchTags->lifetime());
+
+		_searchTags->heightValue() | rpl::skip(
+			1
+		) | rpl::start_with_next([=] {
+			refresh();
+			moveCancelSearchButtons();
+		}, _searchTags->lifetime());
+	} else {
+		_searchTags = nullptr;
+		state.tags.clear();
+	}
+	_searchFromShown = ignoreInChat
+		? nullptr
+		: sublist
+		? sublist->peer().get()
+		: state.fromPeer;
+	if (state.inChat) {
+		onHashtagFilterUpdate(QStringView());
+	}
+	if (_searchFromShown) {
+		_cancelSearchFromUser->show();
+		_searchFromUserUserpic = _searchFromShown->createUserpicView();
+	} else {
+		_cancelSearchFromUser->hide();
+		_searchFromUserUserpic = {};
+	}
+	refreshSearchInChatLabel();
+	moveCancelSearchButtons();
+
 	_searchState = std::move(state);
 	auto newFilter = _searchState.query;
 	const auto mentionsSearch = (newFilter == u"@"_q);
@@ -2569,7 +2638,9 @@ InnerWidget::~InnerWidget() {
 }
 
 void InnerWidget::clearSearchResults(bool clearPeerSearchResults) {
-	if (clearPeerSearchResults) _peerSearchResults.clear();
+	if (clearPeerSearchResults) {
+		_peerSearchResults.clear();
+	}
 	_searchResults.clear();
 	_searchResultsLifetime.destroy();
 	_searchResultsHistories.clear();
@@ -2807,7 +2878,8 @@ void InnerWidget::searchReceived(
 		SearchRequestType type,
 		int fullCount) {
 	const auto uniquePeers = uniqueSearchResults();
-	if (type == SearchRequestType::FromStart || type == SearchRequestType::PeerFromStart) {
+	if (type == SearchRequestType::FromStart
+		|| type == SearchRequestType::PeerFromStart) {
 		clearSearchResults(false);
 	}
 	const auto isMigratedSearch = (type == SearchRequestType::MigratedFromStart)
@@ -3066,81 +3138,6 @@ bool InnerWidget::hasFilteredResults() const {
 	return !_filterResults.empty() && _hashtagResults.empty();
 }
 
-void InnerWidget::searchInChat(
-		Key key,
-		PeerData *from,
-		std::vector<Data::ReactionId> tags) {
-	_searchInMigrated = nullptr;
-	const auto sublist = key.sublist();
-	const auto peer = sublist ? session().user().get() : key.peer();
-	if (peer) {
-		if (const auto migrateTo = peer->migrateTo()) {
-			const auto to = peer->owner().history(migrateTo);
-			return searchInChat(to, from, tags);
-		} else if (const auto migrateFrom = peer->migrateFrom()) {
-			_searchInMigrated = peer->owner().history(migrateFrom);
-		}
-
-		if (peer->isSelf()) {
-			const auto reactions = &peer->owner().reactions();
-			_searchTags = std::make_unique<SearchTags>(
-				&peer->owner(),
-				reactions->myTagsValue(sublist),
-				tags);
-
-			_searchTags->selectedChanges(
-			) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
-				_searchState.tags = std::move(list);
-			}, _searchTags->lifetime());
-
-			_searchTags->repaintRequests() | rpl::start_with_next([=] {
-				const auto height = _searchTags->height();
-				update(0, searchInChatOffset(), width(), height);
-			}, _searchTags->lifetime());
-
-			_searchTags->menuRequests(
-			) | rpl::start_with_next([=](Data::ReactionId id) {
-				HistoryView::ShowTagInListMenu(
-					&_menu,
-					_lastMousePosition.value_or(QCursor::pos()),
-					this,
-					id,
-					_controller);
-			}, _searchTags->lifetime());
-
-			_searchTags->heightValue() | rpl::skip(
-				1
-			) | rpl::start_with_next([=] {
-				refresh();
-				moveCancelSearchButtons();
-			}, _searchTags->lifetime());
-		} else {
-			_searchTags = nullptr;
-			_searchState.tags.clear();
-		}
-	} else {
-		_searchTags = nullptr;
-		_searchState.tags.clear();
-	}
-	_searchState.inChat = key;
-	_searchState.fromPeer = from;
-	_searchFromShown = key.sublist() ? key.sublist()->peer().get() : from;
-	if (_searchState.inChat) {
-		onHashtagFilterUpdate(QStringView());
-	}
-	if (_searchFromShown) {
-		_cancelSearchFromUser->show();
-		_searchFromUserUserpic = _searchFromShown->createUserpicView();
-	} else {
-		_cancelSearchFromUser->hide();
-		_searchFromUserUserpic = {};
-	}
-	if (_searchState.inChat || _searchState.fromPeer) {
-		refreshSearchInChatLabel();
-	}
-	moveCancelSearchButtons();
-}
-
 auto InnerWidget::searchTagsChanges() const
 -> rpl::producer<std::vector<Data::ReactionId>> {
 	return _searchTags
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 805a7ff2b1aba..57f649c3c128a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -146,10 +146,6 @@ class InnerWidget final : public Ui::RpWidget {
 	[[nodiscard]] bool hasFilteredResults() const;
 
 	void applySearchState(SearchState state);
-	void searchInChat(
-		Key key,
-		PeerData *from,
-		std::vector<Data::ReactionId> tags);
 	[[nodiscard]] auto searchTagsChanges() const
 		-> rpl::producer<std::vector<Data::ReactionId>>;
 
@@ -386,6 +382,7 @@ class InnerWidget final : public Ui::RpWidget {
 		const Ui::Text::String &text) const;
 	void refreshSearchInChatLabel();
 	void repaintSearchResult(int index);
+	void paintEmpty(QPainter &p, int top);
 
 	Ui::VideoUserpic *validateVideoUserpic(not_null<Row*> row);
 	Ui::VideoUserpic *validateVideoUserpic(not_null<History*> history);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index cc510a9489c6f..bc9f2426ad587 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -375,7 +375,7 @@ Widget::Widget(
 
 	_search->changes(
 	) | rpl::start_with_next([=] {
-		applySearchUpdate();
+		crl::on_main(this, [=] { applySearchUpdate(); });
 	}, _search->lifetime());
 
 	_search->submits(
@@ -524,7 +524,7 @@ Widget::Widget(
 void Widget::chosenRow(const ChosenRow &row) {
 	storiesToggleExplicitExpand(false);
 
-	if (!currentSearchQuery().isEmpty()) {
+	if (!_searchState.query.isEmpty()) {
 		if (const auto history = row.key.history()) {
 			session().recentPeers().bump(history->peer);
 		}
@@ -1240,6 +1240,7 @@ void Widget::updateSearchTabs() {
 			applySearchState(std::move(copy));
 		}, _searchTabs->lifetime());
 	}
+	const auto sublist = _searchState.inChat.sublist();
 	const auto topic = _searchState.inChat.topic();
 	const auto peer = _searchState.inChat.owningHistory()
 		? _searchState.inChat.owningHistory()->peer.get()
@@ -1258,6 +1259,10 @@ void Widget::updateSearchTabs() {
 		? Ui::Text::SingleCustomEmoji(
 			session().data().customEmojiManager().peerUserpicEmojiData(
 				peer))
+		: sublist
+		? Ui::Text::SingleCustomEmoji(
+			session().data().customEmojiManager().peerUserpicEmojiData(
+				sublist->peer()))
 		: TextWithEntities();
 	const auto myShortLabel = DefaultShortLabel(ChatSearchTab::MyMessages);
 	const auto publicShortLabel = _searchingHashtag
@@ -1275,12 +1280,17 @@ void Widget::updateSearchTabs() {
 			? ChatSearchTab::ThisPeer
 			: ChatSearchTab::MyMessages;
 	}
+	const auto peerTabType = (peer && peer->isBroadcast())
+		? ChatSearchPeerTabType::Channel
+		: (peer && (peer->isChat() || peer->isMegagroup()))
+		? ChatSearchPeerTabType::Group
+		: ChatSearchPeerTabType::Chat;
 	_searchTabs->setTabShortLabels({
 		{ ChatSearchTab::ThisTopic, topicShortLabel },
 		{ ChatSearchTab::ThisPeer, peerShortLabel },
 		{ ChatSearchTab::MyMessages, myShortLabel },
 		{ ChatSearchTab::PublicPosts, publicShortLabel },
-	}, _searchState.tab);
+	}, _searchState.tab, peerTabType);
 
 	updateControlsGeometry();
 }
@@ -1611,7 +1621,7 @@ void Widget::jumpToTop(bool belowPinned) {
 	if (session().supportMode()) {
 		return;
 	}
-	if ((currentSearchQuery().trimmed().isEmpty() && !_searchState.inChat)) {
+	if ((_searchState.query.trimmed().isEmpty() && !_searchState.inChat)) {
 		auto to = 0;
 		if (belowPinned) {
 			const auto list = _openedForum
@@ -1749,7 +1759,7 @@ void Widget::updateStoriesVisibility() {
 		|| _childList
 		|| _searchHasFocus
 		|| _searchSuggestionsLocked
-		|| !currentSearchQuery().isEmpty()
+		|| !_searchState.query.isEmpty()
 		|| _searchState.inChat
 		|| _stories->empty();
 	if (_stories->isHidden() != hidden) {
@@ -1952,16 +1962,22 @@ void Widget::loadMoreBlockedByDate() {
 
 bool Widget::search(bool inCache) {
 	auto result = false;
-	const auto query = currentSearchQuery().trimmed();
+	const auto query = _searchState.query.trimmed();
 	const auto inPeer = searchInPeer();
 	const auto fromPeer = searchFromPeer();
 	const auto &inTags = searchInTags();
 	const auto tab = _searchState.tab;
+	const auto fromStartType = inPeer
+		? SearchRequestType::PeerFromStart
+		: SearchRequestType::FromStart;
 	const auto skipRequest = (query.isEmpty() && !fromPeer && inTags.empty())
 		|| (tab == ChatSearchTab::PublicPosts && query.size() < 2);
 	if (skipRequest) {
 		cancelSearchRequest();
+		searchApplyEmpty(fromStartType, 0);
 		_api.request(base::take(_peerSearchRequest)).cancel();
+		_peerSearchQuery = QString();
+		peerSearchApplyEmpty(0);
 		_api.request(base::take(_topicSearchRequest)).cancel();
 		return true;
 	} else if (inCache) {
@@ -1981,9 +1997,7 @@ bool Widget::search(bool inCache) {
 			_searchFull = _searchFullMigrated = false;
 			cancelSearchRequest();
 			searchReceived(
-				(inPeer
-					? SearchRequestType::PeerFromStart
-					: SearchRequestType::FromStart),
+				fromStartType,
 				i->second,
 				0);
 			result = true;
@@ -2109,21 +2123,14 @@ bool Widget::search(bool inCache) {
 			)).done([=](const MTPcontacts_Found &result, mtpRequestId requestId) {
 				peerSearchReceived(result, requestId);
 			}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
-				peopleFailed(error, requestId);
+				peerSearchFailed(error, requestId);
 			}).send();
 			_peerSearchQueries.emplace(_peerSearchRequest, _peerSearchQuery);
 		}
 	} else {
 		_api.request(base::take(_peerSearchRequest)).cancel();
 		_peerSearchQuery = peerQuery;
-		_peerSearchFull = true;
-		peerSearchReceived(
-			MTP_contacts_found(
-				MTP_vector<MTPPeer>(0),
-				MTP_vector<MTPPeer>(0),
-				MTP_vector<MTPChat>(0),
-				MTP_vector<MTPUser>(0)),
-			0);
+		peerSearchApplyEmpty(0);
 	}
 	if (searchForTopicsRequired(peerQuery)) {
 		if (inCache) {
@@ -2170,64 +2177,7 @@ void Widget::showMainMenu() {
 
 void Widget::searchMessages(SearchState state) {
 	applySearchState(std::move(state));
-	session().local().saveRecentSearchHashtags(state.query);
-	//if (_childList) {
-	//	const auto forum = controller()->shownForum().current();
-	//	const auto topic = inChat.topic();
-	//	if ((forum && forum->channel() == inChat.peer())
-	//		|| (topic && topic->forum() == forum)) {
-	//		_childList->searchMessages(query, inChat);
-	//		return;
-	//	}
-	//	hideChildList();
-	//}
-	//if (_openedFolder) {
-	//	controller()->closeFolder();
-	//}
-
-	//auto tags = Data::SearchTagsFromQuery(query);
-	//if (!tags.empty()) {
-	//	if (!inChat.sublist()) {
-	//		inChat = session().data().history(session().user());
-	//	}
-	//	query = QString();
-	//}
-	//const auto inChatChanged = [&] {
-	//	const auto inPeer = inChat.peer();
-	//	const auto inTopic = inChat.topic();
-	//	if (!inTopic
-	//		&& _openedForum
-	//		&& inPeer == _openedForum->channel()
-	//		&& _subsectionTopBar
-	//		&& _subsectionTopBar->searchMode()) {
-	//		return false;
-	//	} else if ((inTopic || (inPeer && !inPeer->isForum()))
-	//		&& (inChat == _searchState.inChat)) {
-	//		return false;
-	//	} else if (inPeer) {
-	//		if (const auto to = inPeer->migrateTo()) {
-	//			if (to == _searchState.inChat.peer()
-	//				&& !_searchState.inChat.topic()) {
-	//				return false;
-	//			}
-	//		}
-	//	}
-	//	return true;
-	//}();
-	//if ((currentSearchQuery() != query)
-	//	|| inChatChanged
-	//	|| _searchState.tags != tags) {
-	//	if (inChat) {
-	//		cancelSearch();
-	//		setSearchInChat(inChat, nullptr, tags);
-	//	}
-	//	setSearchQuery(query);
-	//	applySearchUpdate(true);
-	//	_searchTimer.cancel();
-	//	searchMessages();
-
-	//	session().local().saveRecentSearchHashtags(query);
-	//}
+	session().local().saveRecentSearchHashtags(_searchState.query);
 }
 
 void Widget::searchTopics() {
@@ -2574,18 +2524,34 @@ void Widget::peerSearchReceived(
 	}
 }
 
+void Widget::searchApplyEmpty(SearchRequestType type, mtpRequestId id) {
+	_searchFull = _searchFullMigrated = true;
+	searchReceived(
+		type,
+		MTP_messages_messages(
+			MTP_vector<MTPMessage>(),
+			MTP_vector<MTPChat>(),
+			MTP_vector<MTPUser>()),
+		id);
+}
+
+void Widget::peerSearchApplyEmpty(mtpRequestId id) {
+	_peerSearchFull = true;
+	peerSearchReceived(
+		MTP_contacts_found(
+			MTP_vector<MTPPeer>(0),
+			MTP_vector<MTPPeer>(0),
+			MTP_vector<MTPChat>(0),
+			MTP_vector<MTPUser>(0)),
+		id);
+}
+
 void Widget::searchFailed(
 		SearchRequestType type,
 		const MTP::Error &error,
 		mtpRequestId requestId) {
 	if (error.type() == u"SEARCH_QUERY_EMPTY"_q) {
-		searchReceived(
-			type,
-			MTP_messages_messages(
-				MTP_vector<MTPMessage>(),
-				MTP_vector<MTPChat>(),
-				MTP_vector<MTPUser>()),
-			requestId);
+		searchApplyEmpty(type, requestId);
 	} else if (_searchRequest == requestId) {
 		_searchRequest = 0;
 		if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
@@ -2596,8 +2562,8 @@ void Widget::searchFailed(
 	}
 }
 
-void Widget::peopleFailed(const MTP::Error &error, mtpRequestId requestId) {
-	if (_peerSearchRequest == requestId) {
+void Widget::peerSearchFailed(const MTP::Error &error, mtpRequestId id) {
+	if (_peerSearchRequest == id) {
 		_peerSearchRequest = 0;
 		_peerSearchFull = true;
 	}
@@ -2702,40 +2668,33 @@ void Widget::listScrollUpdated() {
 }
 
 void Widget::updateCancelSearch() {
-	const auto shown = !_search->getLastText().isEmpty()
+	const auto shown = !_searchState.query.isEmpty()
 		|| (!_searchState.inChat
 			&& (_searchHasFocus || _searchSuggestionsLocked));
 	_cancelSearch->toggle(shown, anim::type::normal);
 }
 
-bool Widget::fixSearchQuery() {
-	if (_fixingSearchQuery) {
-		return false;
-	}
-	_fixingSearchQuery = true;
+QString Widget::validateSearchQuery() {
 	const auto query = currentSearchQuery();
 	if (_searchState.tab == ChatSearchTab::PublicPosts) {
+		_searchingHashtag = true;
 		const auto fixed = FixHashtagSearchQuery(
 			query,
 			currentSearchQueryCursorPosition());
 		if (fixed.text != query) {
 			setSearchQuery(fixed.text, fixed.cursorPosition);
 		}
-		_searchingHashtag = true;
+		return fixed.text;
 	} else if (_searchingHashtag != IsHashtagSearchQuery(query)) {
 		_searchingHashtag = !_searchingHashtag;
 		updateSearchTabs();
 	}
-	_fixingSearchQuery = false;
-	return true;
+	return query;
 }
 
 void Widget::applySearchUpdate() {
-	if (!fixSearchQuery()) {
-		return;
-	}
 	auto copy = _searchState;
-	copy.query = currentSearchQuery();
+	copy.query = validateSearchQuery();
 	applySearchState(std::move(copy));
 
 	if (_chooseFromUser->toggled()
@@ -2755,7 +2714,7 @@ void Widget::updateForceDisplayWide() {
 	controller()->setChatsForceDisplayWide(_searchHasFocus
 		|| (_subsectionTopBar && _subsectionTopBar->searchHasFocus())
 		|| _searchSuggestionsLocked
-		|| !currentSearchQuery().isEmpty()
+		|| !_searchState.query.isEmpty()
 		|| _searchState.inChat);
 }
 
@@ -2961,12 +2920,10 @@ bool Widget::applySearchState(SearchState state) {
 		updateSearchTabs();
 	}
 	if (queryChanged || inChatChanged) {
-		updateJumpToDateVisibility();
 		updateStoriesVisibility();
 	}
-	if (fromPeerChanged) {
-		updateSearchFromVisibility();
-	}
+	updateJumpToDateVisibility();
+	updateSearchFromVisibility();
 	updateLockUnlockPosition();
 
 	if ((state.query.isEmpty() && !state.fromPeer && state.tags.empty())
@@ -2988,6 +2945,7 @@ bool Widget::applySearchState(SearchState state) {
 		controller()->closeFolder();
 	}
 
+	setSearchQuery(_searchState.query);
 	_inner->applySearchState(_searchState);
 
 	if (!_postponeProcessSearchFocusChange) {
@@ -3009,7 +2967,7 @@ bool Widget::applySearchState(SearchState state) {
 		&& _lastSearchText == HistoryView::SwitchToChooseFromQuery()) {
 		cancelSearch();
 	}
-	if (_searchState.inChat || !_search->getLastText().isEmpty()) {
+	if (_searchState.inChat || !_searchState.query.isEmpty()) {
 		_search->setFocus();
 	} else {
 		setInnerFocus();
@@ -3138,7 +3096,7 @@ void Widget::updateLockUnlockVisibility(anim::type animated) {
 		|| _searchHasFocus
 		|| _searchSuggestionsLocked
 		|| _searchState.inChat
-		|| !_search->getLastText().isEmpty();
+		|| !_searchState.query.isEmpty();
 	if (_lockUnlock->toggled() == hidden) {
 		const auto stories = _stories && !_stories->empty();
 		_lockUnlock->toggle(
@@ -3157,7 +3115,7 @@ void Widget::updateLoadMoreChatsVisibility() {
 	}
 	const auto hidden = (_openedFolder != nullptr)
 		|| (_openedForum != nullptr)
-		|| !currentSearchQuery().isEmpty();
+		|| !_searchState.query.isEmpty();
 	if (_loadMoreChats->isHidden() != hidden) {
 		_loadMoreChats->setVisible(!hidden);
 		updateControlsGeometry();
@@ -3170,7 +3128,7 @@ void Widget::updateJumpToDateVisibility(bool fast) {
 	}
 
 	_jumpToDate->toggle(
-		(_searchState.inChat && _search->getLastText().isEmpty()),
+		(searchInPeer() && _searchState.query.isEmpty()),
 		fast ? anim::type::instant : anim::type::normal);
 }
 
@@ -3617,6 +3575,10 @@ void Widget::clearSearchField() {
 }
 
 void Widget::setSearchQuery(const QString &query, int cursorPosition) {
+	if (query.isEmpty()) {
+		clearSearchField();
+		return;
+	}
 	if (cursorPosition < 0) {
 		cursorPosition = query.size();
 	}
@@ -3666,7 +3628,6 @@ bool Widget::cancelSearch() {
 	_lastSearchPeer = nullptr;
 	_lastSearchId = _lastSearchMigratedId = 0;
 	_inner->clearFilter();
-	clearSearchField();
 	applySearchState(std::move(updatedState));
 	if (_suggestions && clearSearchFocus) {
 		setInnerFocus(true);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index f265ebf874771..47b407e07a830 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -232,7 +232,7 @@ class Widget final : public Window::AbstractSectionWidget {
 
 	void fullSearchRefreshOn(rpl::producer<> events);
 	void updateCancelSearch();
-	bool fixSearchQuery();
+	[[nodiscard]] QString validateSearchQuery();
 	void applySearchUpdate();
 	void refreshLoadMoreButton(bool mayBlock, bool isBlocked);
 	void loadMoreBlockedByDate();
@@ -241,7 +241,9 @@ class Widget final : public Window::AbstractSectionWidget {
 		SearchRequestType type,
 		const MTP::Error &error,
 		mtpRequestId requestId);
-	void peopleFailed(const MTP::Error &error, mtpRequestId requestId);
+	void peerSearchFailed(const MTP::Error &error, mtpRequestId requestId);
+	void searchApplyEmpty(SearchRequestType type, mtpRequestId id);
+	void peerSearchApplyEmpty(mtpRequestId id);
 
 	void updateForceDisplayWide();
 	void scrollToDefault(bool verytop = false);
@@ -307,7 +309,6 @@ class Widget final : public Window::AbstractSectionWidget {
 	object_ptr<Ui::JumpDownButton> _scrollToTop;
 	bool _scrollToTopIsShown = false;
 	bool _forumSearchRequested = false;
-	bool _fixingSearchQuery = false;
 	bool _searchingHashtag = false;
 
 	Data::Folder *_openedFolder = nullptr;
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
index 456183d304d69..d79eb0502abd2 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
@@ -77,6 +77,10 @@ FixedHashtagSearchQuery FixHashtagSearchQuery(
 			result += ch;
 		}
 	}
+	if (result.size() == start) {
+		result += '#';
+		++cursorPosition;
+	}
 	return { result, cursorPosition };
 }
 
@@ -123,23 +127,17 @@ ChatSearchTabs::ChatSearchTabs(QWidget *parent, ChatSearchTab active)
 
 ChatSearchTabs::~ChatSearchTabs() = default;
 
-void ChatSearchTabs::setPeerTabType(ChatSearchPeerTabType type) {
-	_type = type;
-	const auto i = ranges::find(_list, ChatSearchTab::ThisPeer, &Tab::value);
-	Assert(i != end(_list));
-	i->label = TabLabel(ChatSearchTab::ThisPeer, type);
-	if (!i->shortLabel.empty()) {
-		refreshTabs(_active.current());
-	}
-}
-
 void ChatSearchTabs::setTabShortLabels(
 		std::vector<ShortLabel> labels,
-		ChatSearchTab active) {
+		ChatSearchTab active,
+		ChatSearchPeerTabType peerTabType) {
 	for (const auto &label : labels) {
 		const auto i = ranges::find(_list, label.tab, &Tab::value);
 		Assert(i != end(_list));
 		i->shortLabel = std::move(label.label);
+		if (i->value == ChatSearchTab::ThisPeer) {
+			i->label = TabLabel(label.tab, peerTabType);
+		}
 	}
 	refreshTabs(active);
 }
@@ -175,4 +173,8 @@ int ChatSearchTabs::resizeGetHeight(int newWidth) {
 	return _tabs->height();
 }
 
+void ChatSearchTabs::paintEvent(QPaintEvent *e) {
+	QPainter(this).fillRect(e->rect(), st::dialogsBg);
+}
+
 } // namespace Dialogs
\ No newline at end of file
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h
index 0e2640f834b5d..ba87f9f98d8a6 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h
@@ -37,8 +37,6 @@ class ChatSearchTabs final : public Ui::RpWidget {
 	ChatSearchTabs(QWidget *parent, ChatSearchTab active);
 	~ChatSearchTabs();
 
-	void setPeerTabType(ChatSearchPeerTabType type);
-
 	// A [custom] emoji to use when there is not enough space for text.
 	// Only tabs with available short labels are shown.
 	struct ShortLabel {
@@ -47,7 +45,8 @@ class ChatSearchTabs final : public Ui::RpWidget {
 	};
 	void setTabShortLabels(
 		std::vector<ShortLabel> labels,
-		ChatSearchTab active);
+		ChatSearchTab active,
+		ChatSearchPeerTabType peerTabType);
 
 	[[nodiscard]] rpl::producer<ChatSearchTab> tabChanges() const;
 
@@ -60,13 +59,13 @@ class ChatSearchTabs final : public Ui::RpWidget {
 
 	void refreshTabs(ChatSearchTab active);
 	int resizeGetHeight(int newWidth) override;
+	void paintEvent(QPaintEvent *e) override;
 
 	const std::unique_ptr<Ui::SettingsSlider> _tabs;
 	const std::unique_ptr<Ui::PlainShadow> _shadow;
 
 	std::vector<Tab> _list;
 	rpl::variable<ChatSearchTab> _active;
-	ChatSearchPeerTabType _type = {};
 
 };
 

From 583bcca6a903184af61bd64c49f4e0f36ac0205d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 10:51:14 +0400
Subject: [PATCH 195/400] Fix forum search open by Ctrl+F.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index bc9f2426ad587..da58fd030c0cb 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1599,8 +1599,7 @@ void Widget::checkUpdateStatus() {
 void Widget::setInnerFocus(bool unfocusSearch) {
 	if (_childList) {
 		_childList->setInnerFocus();
-	} else if ((_openedFolder || _openedForum)
-		&& _subsectionTopBar->searchSetFocus()) {
+	} else if (_subsectionTopBar && _subsectionTopBar->searchSetFocus()) {
 		return;
 	} else if (!unfocusSearch
 		&& (!_search->getLastText().isEmpty()
@@ -2967,10 +2966,10 @@ bool Widget::applySearchState(SearchState state) {
 		&& _lastSearchText == HistoryView::SwitchToChooseFromQuery()) {
 		cancelSearch();
 	}
-	if (_searchState.inChat || !_searchState.query.isEmpty()) {
-		_search->setFocus();
-	} else {
+	if (!_searchState.inChat && _searchState.query.isEmpty()) {
 		setInnerFocus();
+	} else if (!_subsectionTopBar || !_subsectionTopBar->searchSetFocus()) {
+		_search->setFocus();
 	}
 	updateForceDisplayWide();
 	applySearchUpdate();

From 701bf0d553869df470cad1de1864b2f00384f460 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 10:58:18 +0400
Subject: [PATCH 196/400] Fix searching with "from:" prefix.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index da58fd030c0cb..ca9994f32ac42 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2881,6 +2881,12 @@ bool Widget::applySearchState(SearchState state) {
 		state.inChat = session().data().history(session().user());
 	}
 
+	const auto clearQuery = state.fromPeer
+		&& (_lastSearchText == HistoryView::SwitchToChooseFromQuery());
+	if (clearQuery) {
+		state.query = _lastSearchText = QString();
+	}
+
 	const auto inChatChanged = (_searchState.inChat != state.inChat);
 	const auto fromPeerChanged = (_searchState.fromPeer != state.fromPeer);
 	const auto tagsChanged = (_searchState.tags != state.tags);
@@ -2962,10 +2968,6 @@ bool Widget::applySearchState(SearchState state) {
 		_subsectionTopBar->searchEnableJumpToDate(
 			_openedForum && _searchState.inChat);
 	}
-	if (_searchState.fromPeer
-		&& _lastSearchText == HistoryView::SwitchToChooseFromQuery()) {
-		cancelSearch();
-	}
 	if (!_searchState.inChat && _searchState.query.isEmpty()) {
 		setInnerFocus();
 	} else if (!_subsectionTopBar || !_subsectionTopBar->searchSetFocus()) {

From 7d61ab9412d2a74444d29bca1579002fc5ba44bb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 11:52:59 +0400
Subject: [PATCH 197/400] Improve forum search support.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 27 ++++++++++++++++---
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  1 +
 .../dialogs/ui/chat_search_tabs.cpp           |  8 +++---
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index ca9994f32ac42..7755bc84ee08f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -615,6 +615,7 @@ void Widget::chosenRow(const ChosenRow &row) {
 			escape();
 		}
 	}
+	updateForceDisplayWide();
 }
 
 void Widget::setGeometryWithTopMoved(
@@ -1234,7 +1235,9 @@ void Widget::updateSearchTabs() {
 			_searchState.tab);
 		_searchTabs->setVisible(!_showAnimation);
 		_searchTabs->tabChanges(
-		) | rpl::start_with_next([=](ChatSearchTab tab) {
+		) | rpl::filter([=](ChatSearchTab tab) {
+			return (_searchState.tab != tab);
+		}) | rpl::start_with_next([=](ChatSearchTab tab) {
 			auto copy = _searchState;
 			copy.tab = tab;
 			applySearchState(std::move(copy));
@@ -1244,6 +1247,8 @@ void Widget::updateSearchTabs() {
 	const auto topic = _searchState.inChat.topic();
 	const auto peer = _searchState.inChat.owningHistory()
 		? _searchState.inChat.owningHistory()->peer.get()
+		: _openedForum
+		? _openedForum->channel().get()
 		: nullptr;
 	const auto topicShortLabel = topic
 		? Ui::Text::SingleCustomEmoji(Data::TopicIconEmojiEntity({
@@ -1271,7 +1276,8 @@ void Widget::updateSearchTabs() {
 	if ((_searchState.tab == ChatSearchTab::ThisTopic
 		&& !_searchState.inChat.topic())
 		|| (_searchState.tab == ChatSearchTab::ThisPeer
-			&& !_searchState.inChat)
+			&& !_searchState.inChat
+			&& !_openedForum)
 		|| (_searchState.tab == ChatSearchTab::PublicPosts
 			&& !_searchingHashtag)) {
 		_searchState.tab = _searchState.inChat.topic()
@@ -1960,6 +1966,12 @@ void Widget::loadMoreBlockedByDate() {
 }
 
 bool Widget::search(bool inCache) {
+	_processingSearch = true;
+	const auto guard = gsl::finally([&] {
+		_processingSearch = false;
+		listScrollUpdated();
+	});
+
 	auto result = false;
 	const auto query = _searchState.query.trimmed();
 	const auto inPeer = searchInPeer();
@@ -2710,6 +2722,10 @@ void Widget::applySearchUpdate() {
 }
 
 void Widget::updateForceDisplayWide() {
+	if (_childList) {
+		_childList->updateForceDisplayWide();
+		return;
+	}
 	controller()->setChatsForceDisplayWide(_searchHasFocus
 		|| (_subsectionTopBar && _subsectionTopBar->searchHasFocus())
 		|| _searchSuggestionsLocked
@@ -2791,6 +2807,7 @@ void Widget::openChildList(
 	if (hasFocus()) {
 		setInnerFocus();
 	}
+	updateForceDisplayWide();
 }
 
 void Widget::closeChildList(anim::type animated) {
@@ -2846,6 +2863,7 @@ void Widget::closeChildList(anim::type animated) {
 		_childListShadow = nullptr;
 	}
 	updateStoriesVisibility();
+	updateForceDisplayWide();
 }
 
 bool Widget::applySearchState(SearchState state) {
@@ -2970,8 +2988,10 @@ bool Widget::applySearchState(SearchState state) {
 	}
 	if (!_searchState.inChat && _searchState.query.isEmpty()) {
 		setInnerFocus();
-	} else if (!_subsectionTopBar || !_subsectionTopBar->searchSetFocus()) {
+	} else if (!_subsectionTopBar) {
 		_search->setFocus();
+	} else if (_openedForum && !_subsectionTopBar->searchSetFocus()) {
+		_subsectionTopBar->toggleSearch(true, anim::type::normal);
 	}
 	updateForceDisplayWide();
 	applySearchUpdate();
@@ -3633,6 +3653,7 @@ bool Widget::cancelSearch() {
 	if (_suggestions && clearSearchFocus) {
 		setInnerFocus(true);
 	}
+	updateForceDisplayWide();
 	return clearingQuery || clearingInChat || clearSearchFocus;
 }
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 47b407e07a830..ec604f61ca96c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -319,6 +319,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	QString _lastSearchText;
 	bool _searchSuggestionsLocked = false;
 	bool _searchHasFocus = false;
+	bool _processingSearch = false;
 
 	rpl::event_stream<rpl::producer<Stories::Content>> _storiesContents;
 	base::flat_map<PeerId, Ui::PeerUserpicView> _storiesUserpicsViewsHidden;
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
index d79eb0502abd2..f035033875049 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
@@ -114,13 +114,13 @@ ChatSearchTabs::ChatSearchTabs(QWidget *parent, ChatSearchTab active)
 	_tabs->sectionActivated(
 	) | rpl::start_with_next([=](int index) {
 		for (const auto &tab : _list) {
-			if (!index) {
+			if (tab.shortLabel.empty()) {
+				continue;
+			} else if (!index) {
 				_active = tab.value;
 				return;
 			}
-			if (!tab.shortLabel.empty()) {
-				--index;
-			}
+			--index;
 		}
 	}, lifetime());
 }

From b21bcb86cc87bb2a6f560edcdb38153b066752d4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 14:05:32 +0400
Subject: [PATCH 198/400] Fix search from user in forums.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 7755bc84ee08f..6b9c4fb2541e2 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1408,6 +1408,9 @@ void Widget::changeOpenedForum(Data::Forum *forum, anim::type animated) {
 		cancelSearch();
 		closeChildList(anim::type::instant);
 		_openedForum = forum;
+		_searchState.tab = forum
+			? ChatSearchTab::ThisPeer
+			: ChatSearchTab::MyMessages;
 		_api.request(base::take(_topicSearchRequest)).cancel();
 		_inner->changeOpenedForum(forum);
 		storiesToggleExplicitExpand(false);
@@ -1468,6 +1471,7 @@ void Widget::refreshTopBars() {
 			setFocus();
 		}
 		_subsectionTopBar.destroy();
+		updateSearchFromVisibility(true);
 	}
 	_forumSearchRequested = false;
 	if (_openedForum) {
@@ -1542,9 +1546,6 @@ void Widget::showSearchInTopBar(anim::type animated) {
 	Expects(_subsectionTopBar != nullptr);
 
 	_subsectionTopBar->toggleSearch(true, animated);
-	_subsectionTopBar->searchEnableChooseFromUser(
-		true,
-		!_searchState.fromPeer);
 	updateForceDisplayWide();
 }
 
@@ -2888,12 +2889,18 @@ bool Widget::applySearchState(SearchState state) {
 	if (state.inChat.folder() || (forum && !topic)) {
 		state.inChat = {};
 	}
-	if (!state.inChat && !forum) {
+	if (!state.inChat && !forum && !_openedForum) {
 		state.fromPeer = nullptr;
 	}
 	if (state.tab == ChatSearchTab::PublicPosts
 		&& !IsHashtagSearchQuery(state.query)) {
-		state.tab = ChatSearchTab::MyMessages;
+		state.tab = (_openedForum && !state.inChat)
+			? ChatSearchTab::ThisPeer
+			: ChatSearchTab::MyMessages;
+	} else if (!state.inChat && !_searchTabs) {
+		state.tab = (forum || _openedForum)
+			? ChatSearchTab::ThisPeer
+			: ChatSearchTab::MyMessages;
 	}
 	if (!state.tags.empty()) {
 		state.inChat = session().data().history(session().user());
@@ -2913,11 +2920,9 @@ bool Widget::applySearchState(SearchState state) {
 
 	if (forum) {
 		if (_openedForum == forum) {
-			_searchState.fromPeer = state.fromPeer; // showSearchInTopBar
 			showSearchInTopBar(anim::type::normal);
 		} else if (_layout == Layout::Main) {
 			_forumSearchRequested = true;
-			_searchState.fromPeer = state.fromPeer; // showSearchInTopBar
 			controller()->showForum(forum);
 		} else {
 			return false;
@@ -3162,11 +3167,13 @@ void Widget::updateSearchFromVisibility(bool fast) {
 		}
 		return false;
 	}();
-	auto changed = (visible == !_chooseFromUser->toggled());
+	const auto changed = (visible == !_chooseFromUser->toggled());
 	_chooseFromUser->toggle(
 		visible,
 		fast ? anim::type::instant : anim::type::normal);
-	if (changed) {
+	if (_subsectionTopBar) {
+		_subsectionTopBar->searchEnableChooseFromUser(true, visible);
+	} else if (changed) {
 		auto additional = QMargins();
 		if (visible) {
 			additional.setRight(_chooseFromUser->width());

From fce520c9c02ad1ef6582ac02246e45eb257172c0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 14:40:10 +0400
Subject: [PATCH 199/400] Clear saved messages tags on cancel search.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 6b9c4fb2541e2..6024e7b04fee5 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3623,7 +3623,9 @@ bool Widget::cancelSearch() {
 	auto updatedState = _searchState;
 	const auto clearingQuery = !updatedState.query.isEmpty();
 	auto clearingInChat = !clearingQuery
-		&& (updatedState.inChat || updatedState.fromPeer);
+		&& (updatedState.inChat
+			|| updatedState.fromPeer
+			|| !updatedState.tags.empty());
 	if (clearingQuery) {
 		updatedState.query = QString();
 	} else if (clearingInChat) {
@@ -3636,6 +3638,7 @@ bool Widget::cancelSearch() {
 		}
 		updatedState.inChat = {};
 		updatedState.fromPeer = nullptr;
+		updatedState.tags = {};
 	}
 	if (!clearingQuery
 		&& _subsectionTopBar

From 42d53e5543d38371c705eca0c0618520007d1457 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 17:38:18 +0400
Subject: [PATCH 200/400] Fix saved messages tags search.

---
 .../dialogs/dialogs_inner_widget.cpp          | 59 +++++++++++--------
 .../dialogs/dialogs_inner_widget.h            |  4 ++
 Telegram/SourceFiles/dialogs/dialogs_key.cpp  |  2 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  3 +-
 4 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index ee71e46e7970c..274d889a90692 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -488,7 +488,7 @@ int InnerWidget::peerSearchOffset() const {
 		+ st::searchedBarHeight;
 }
 
-int InnerWidget::searchInChatOffset() const {
+int InnerWidget::searchTagsOffset() const {
 	auto result = peerSearchOffset() - st::searchedBarHeight;
 	if (!_peerSearchResults.empty()) {
 		result += (_peerSearchResults.size() * st::dialogsRowHeight)
@@ -497,6 +497,14 @@ int InnerWidget::searchInChatOffset() const {
 	return result;
 }
 
+int InnerWidget::searchInChatOffset() const {
+	auto result = searchTagsOffset();
+	if (_searchTags) {
+		result += _searchTags->height();
+	}
+	return result;
+}
+
 int InnerWidget::searchedOffset() const {
 	return searchInChatOffset()
 		+ searchInChatSkip()
@@ -505,9 +513,6 @@ int InnerWidget::searchedOffset() const {
 
 int InnerWidget::searchInChatSkip() const {
 	auto result = 0;
-	if (_searchTags) {
-		result += _searchTags->height();
-	}
 	if (_searchFromShown) {
 		result += st::dialogsSearchInHeight;
 	}
@@ -857,6 +862,17 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			}
 		}
 
+		if (_searchTags) {
+			paintSearchTags(p, {
+				.st = &st::forumTopicRow,
+				.currentBg = currentBg(),
+				.now = ms,
+				.width = fullWidth,
+				.paused = videoPaused,
+			});
+			p.translate(0, _searchTags->height());
+			top += _searchTags->height();
+		}
 		if (_searchFromShown) {
 			paintSearchInChat(p, {
 				.st = &st::forumTopicRow,
@@ -1117,20 +1133,24 @@ QBrush InnerWidget::currentBg() const {
 		_childListShown.current().shown);
 }
 
+void InnerWidget::paintSearchTags(
+		Painter &p,
+		const Ui::PaintContext &context) const {
+	Expects(_searchTags != nullptr);
+
+	const auto height = _searchTags->height();
+	p.fillRect(0, 0, width(), height, currentBg());
+	const auto top = st::dialogsSearchTagBottom / 2;
+	const auto position = QPoint(_searchTagsLeft, top);
+	_searchTags->paint(p, position, context.now, context.paused);
+}
+
 void InnerWidget::paintSearchInChat(
 		Painter &p,
 		const Ui::PaintContext &context) const {
 	auto height = searchInChatSkip();
 
 	auto top = 0;
-	if (_searchTags) {
-		const auto height = _searchTags->height();
-		top += st::dialogsSearchTagBottom;
-		p.fillRect(0, top, width(), height, currentBg());
-		const auto position = QPoint(_searchTagsLeft, top);
-		_searchTags->paint(p, position, context.now, context.paused);
-		top += height - st::dialogsSearchTagBottom;
-	}
 	p.setFont(st::searchedBarFont);
 	auto fullRect = QRect(0, top, width(), height - top);
 	p.fillRect(fullRect, currentBg());
@@ -1280,7 +1300,7 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 
 	const auto tagBase = QPoint(
 		_searchTagsLeft,
-		searchInChatOffset() + st::dialogsSearchTagBottom);
+		searchTagsOffset() + st::dialogsSearchTagBottom / 2);
 	const auto tagPoint = local - tagBase;
 	const auto inTags = _searchTags
 		&& QRect(
@@ -2464,11 +2484,7 @@ void InnerWidget::applySearchState(SearchState state) {
 	const auto ignoreInChat = (state.tab == ChatSearchTab::MyMessages)
 		|| (state.tab == ChatSearchTab::PublicPosts);
 	const auto sublist = ignoreInChat ? nullptr : state.inChat.sublist();
-	const auto peer = ignoreInChat
-		? nullptr
-		: sublist
-		? session().user().get()
-		: state.inChat.peer();
+	const auto peer = ignoreInChat ? nullptr : state.inChat.peer();
 	if (const auto migrateFrom = peer ? peer->migrateFrom() : nullptr) {
 		_searchInMigrated = peer->owner().history(migrateFrom);
 	} else {
@@ -2481,14 +2497,9 @@ void InnerWidget::applySearchState(SearchState state) {
 			reactions->myTagsValue(sublist),
 			state.tags);
 
-		_searchTags->selectedChanges(
-		) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
-			_searchState.tags = std::move(list);
-		}, _searchTags->lifetime());
-
 		_searchTags->repaintRequests() | rpl::start_with_next([=] {
 			const auto height = _searchTags->height();
-			update(0, searchInChatOffset(), width(), height);
+			update(0, searchTagsOffset(), width(), height);
 		}, _searchTags->lifetime());
 
 		_searchTags->menuRequests(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 57f649c3c128a..8cde8de924431 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -334,6 +334,7 @@ class InnerWidget final : public Ui::RpWidget {
 	[[nodiscard]] int filteredIndex(int y) const;
 	[[nodiscard]] int filteredHeight(int till = -1) const;
 	[[nodiscard]] int peerSearchOffset() const;
+	[[nodiscard]] int searchTagsOffset() const;
 	[[nodiscard]] int searchInChatOffset() const;
 	[[nodiscard]] int searchedOffset() const;
 	[[nodiscard]] int searchInChatSkip() const;
@@ -349,6 +350,9 @@ class InnerWidget final : public Ui::RpWidget {
 		Painter &p,
 		not_null<const PeerSearchResult*> result,
 		const Ui::PaintContext &context);
+	void paintSearchTags(
+		Painter &p,
+		const Ui::PaintContext &context) const;
 	void paintSearchInChat(
 		Painter &p,
 		const Ui::PaintContext &context) const;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_key.cpp b/Telegram/SourceFiles/dialogs/dialogs_key.cpp
index 263a605cc6d85..8a8cf398cdbde 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_key.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_key.cpp
@@ -93,7 +93,7 @@ PeerData *Key::peer() const {
 ChatSearchTab SearchState::defaultTabForMe() const {
 	return inChat.topic()
 		? ChatSearchTab::ThisTopic
-		: inChat.history()
+		: (inChat.history() || inChat.sublist())
 		? ChatSearchTab::ThisPeer
 		: ChatSearchTab::MyMessages;
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 6024e7b04fee5..5d8cdc0636212 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1282,7 +1282,8 @@ void Widget::updateSearchTabs() {
 			&& !_searchingHashtag)) {
 		_searchState.tab = _searchState.inChat.topic()
 			? ChatSearchTab::ThisTopic
-			: _searchState.inChat.owningHistory()
+			: (_searchState.inChat.owningHistory()
+				|| _searchState.inChat.sublist())
 			? ChatSearchTab::ThisPeer
 			: ChatSearchTab::MyMessages;
 	}

From 7b7438cd7b6476b942642ee26cd363cc5b3a0cf6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 May 2024 18:00:34 +0400
Subject: [PATCH 201/400] Make chats list tabs closer to each other.

---
 Telegram/SourceFiles/dialogs/dialogs.style              | 4 ++--
 Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp    | 6 +++---
 Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp | 8 ++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 3ee37b6f91fa7..63c85b6383866 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -649,7 +649,7 @@ dialogsSearchTabs: SettingsSlider(defaultSettingsSlider) {
 	barRadius: 2px;
 	barFg: transparent;
 	barSnapToLabel: true;
-	strictSkip: 34px;
+	strictSkip: 18px;
 	labelTop: 7px;
 	labelStyle: semiboldTextStyle;
 	labelFg: windowSubTextFg;
@@ -659,7 +659,7 @@ dialogsSearchTabs: SettingsSlider(defaultSettingsSlider) {
 	rippleBgActive: lightButtonBgOver;
 	ripple: defaultRippleAnimation;
 }
-
+dialogsSearchTabsPadding: 8px;
 
 dialogsStoriesList: DialogsStoriesList {
 	small: dialogsStories;
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
index f035033875049..504321fabd51c 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
@@ -110,7 +110,7 @@ ChatSearchTabs::ChatSearchTabs(QWidget *parent, ChatSearchTab active)
 	}) {
 		_list.push_back({ tab, TabLabel(tab) });
 	}
-	_tabs->move(0, 0);
+	_tabs->move(st::dialogsSearchTabsPadding, 0);
 	_tabs->sectionActivated(
 	) | rpl::start_with_next([=](int index) {
 		for (const auto &tab : _list) {
@@ -166,9 +166,9 @@ void ChatSearchTabs::refreshTabs(ChatSearchTab active) {
 int ChatSearchTabs::resizeGetHeight(int newWidth) {
 	_tabs->resizeToWidth(newWidth);
 	_shadow->setGeometry(
-		_tabs->x(),
+		0,
 		_tabs->y() + _tabs->height() - st::lineWidth,
-		_tabs->width(),
+		newWidth,
 		st::lineWidth);
 	return _tabs->height();
 }
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 37be201fa979e..868b3b74c037b 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -903,9 +903,13 @@ void Suggestions::setupTabs() {
 	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
 	shadow->lower();
 
-	_tabs->sizeValue() | rpl::start_with_next([=](QSize size) {
+	_tabs->move(st::dialogsSearchTabsPadding, 0);
+	rpl::combine(
+		widthValue(),
+		_tabs->heightValue()
+	) | rpl::start_with_next([=](int width, int height) {
 		const auto line = st::lineWidth;
-		shadow->setGeometry(0, size.height() - line, size.width(), line);
+		shadow->setGeometry(0, height - line, width, line);
 	}, shadow->lifetime());
 
 	shadow->showOn(_tabs->shownValue());

From 279db771cf86c833d2fe0f6087faefa73e241904 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 May 2024 09:36:56 +0400
Subject: [PATCH 202/400] Support dynamic search tabs with emoji.

---
 .../boxes/peers/edit_forum_topic_box.cpp      | 36 ++++---
 .../boxes/peers/edit_forum_topic_box.h        |  4 +-
 .../data/stickers/data_custom_emoji.cpp       |  2 +-
 Telegram/SourceFiles/dialogs/dialogs.style    |  5 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 22 ++++-
 .../dialogs/ui/chat_search_tabs.cpp           | 99 +++++++++++--------
 .../SourceFiles/dialogs/ui/chat_search_tabs.h |  9 +-
 .../ui/widgets/discrete_sliders.cpp           | 30 ++++++
 .../SourceFiles/ui/widgets/discrete_sliders.h | 11 +++
 9 files changed, 158 insertions(+), 60 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
index e8a8b9d59dcce..ed8a777870642 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
@@ -48,7 +48,8 @@ class DefaultIconEmoji final : public Ui::Text::CustomEmoji {
 public:
 	DefaultIconEmoji(
 		rpl::producer<DefaultIcon> value,
-		Fn<void()> repaint);
+		Fn<void()> repaint,
+		Data::CustomEmojiSizeTag tag);
 
 	int width() override;
 	QString entityData() override;
@@ -61,14 +62,17 @@ class DefaultIconEmoji final : public Ui::Text::CustomEmoji {
 private:
 	DefaultIcon _icon = {};
 	QImage _image;
+	Data::CustomEmojiSizeTag _tag = {};
 
 	rpl::lifetime _lifetime;
 
 };
 
 DefaultIconEmoji::DefaultIconEmoji(
-		rpl::producer<DefaultIcon> value,
-		Fn<void()> repaint) {
+	rpl::producer<DefaultIcon> value,
+	Fn<void()> repaint,
+	Data::CustomEmojiSizeTag tag)
+: _tag(tag) {
 	std::move(value) | rpl::start_with_next([=](DefaultIcon value) {
 		_icon = value;
 		_image = QImage();
@@ -85,19 +89,22 @@ QString DefaultIconEmoji::entityData() {
 }
 
 void DefaultIconEmoji::paint(QPainter &p, const Context &context) {
+	const auto &st = (_tag == Data::CustomEmojiSizeTag::Normal)
+		? st::normalForumTopicIcon
+		: st::defaultForumTopicIcon;
 	if (_image.isNull()) {
 		_image = Data::IsForumGeneralIconTitle(_icon.title)
 			? Data::ForumTopicGeneralIconFrame(
-				st::defaultForumTopicIcon.size,
+				st.size,
 				Data::ParseForumGeneralIconColor(_icon.colorId))
-			: Data::ForumTopicIconFrame(
-				_icon.colorId,
-				_icon.title,
-				st::defaultForumTopicIcon);
+			: Data::ForumTopicIconFrame(_icon.colorId, _icon.title, st);
 	}
-	const auto esize = Ui::Emoji::GetSizeLarge() / style::DevicePixelRatio();
+	const auto full = (_tag == Data::CustomEmojiSizeTag::Normal)
+		? Ui::Emoji::GetSizeNormal()
+		: Ui::Emoji::GetSizeLarge();
+	const auto esize = full / style::DevicePixelRatio();
 	const auto customSize = Ui::Text::AdjustCustomEmojiSize(esize);
-	const auto skip = (customSize - st::defaultForumTopicIcon.size) / 2;
+	const auto skip = (customSize - st.size) / 2;
 	p.drawImage(context.position + QPoint(skip, skip), _image);
 }
 
@@ -262,7 +269,8 @@ struct IconSelector {
 		if (id == kDefaultIconId) {
 			return std::make_unique<DefaultIconEmoji>(
 				rpl::duplicate(defaultIcon),
-				std::move(repaint));
+				std::move(repaint),
+				tag);
 		}
 		return manager->create(id, std::move(repaint), tag);
 	};
@@ -576,8 +584,10 @@ void EditForumTopicBox(
 
 std::unique_ptr<Ui::Text::CustomEmoji> MakeTopicIconEmoji(
 		Data::TopicIconDescriptor descriptor,
-		Fn<void()> repaint) {
+		Fn<void()> repaint,
+		Data::CustomEmojiSizeTag tag) {
 	return std::make_unique<DefaultIconEmoji>(
 		rpl::single(descriptor),
-		std::move(repaint));
+		std::move(repaint),
+		tag);
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.h b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.h
index 620ecebaf0d33..81758e84c2623 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.h
@@ -13,6 +13,7 @@ class History;
 
 namespace Data {
 struct TopicIconDescriptor;
+enum class CustomEmojiSizeTag : uchar;
 } // namespace Data
 
 namespace Window {
@@ -32,4 +33,5 @@ void EditForumTopicBox(
 
 [[nodiscard]] std::unique_ptr<Ui::Text::CustomEmoji> MakeTopicIconEmoji(
 	Data::TopicIconDescriptor descriptor,
-	Fn<void()> repaint);
+	Fn<void()> repaint,
+	Data::CustomEmojiSizeTag tag);
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index 7f110b6b1d517..c7eea5d48ffd3 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -542,7 +542,7 @@ std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::create(
 		const auto size = EmojiSizeFromTag(tag) / ratio;
 		return userpic(data, std::move(update), size);
 	} else if (const auto parsed = Data::ParseTopicIconEmojiEntity(data)) {
-		return MakeTopicIconEmoji(parsed, std::move(update));
+		return MakeTopicIconEmoji(parsed, std::move(update), tag);
 	}
 	const auto parsed = ParseCustomEmojiData(data);
 	return parsed
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 63c85b6383866..caa3526e20a8f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -46,6 +46,11 @@ defaultForumTopicIcon: ForumTopicIcon {
 	font: font(bold 11px);
 	textTop: 2px;
 }
+normalForumTopicIcon: ForumTopicIcon {
+	size: 19px;
+	font: font(bold 10px);
+	textTop: 2px;
+}
 largeForumTopicIcon: ForumTopicIcon {
 	size: 26px;
 	font: font(bold 13px);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 5d8cdc0636212..db8724a61b8c8 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -47,6 +47,7 @@ For license and copyright information please follow this link:
 #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"
@@ -1230,9 +1231,17 @@ void Widget::updateSearchTabs() {
 		}
 		return;
 	} else if (!_searchTabs) {
+		const auto savedSession = &session();
+		const auto markedTextContext = [=](Fn<void()> repaint) {
+			return Core::MarkedTextContext{
+				.session = savedSession,
+				.customEmojiRepaint = std::move(repaint),
+			};
+		};
 		_searchTabs = std::make_unique<ChatSearchTabs>(
 			this,
-			_searchState.tab);
+			_searchState.tab,
+			std::move(markedTextContext));
 		_searchTabs->setVisible(!_showAnimation);
 		_searchTabs->tabChanges(
 		) | rpl::filter([=](ChatSearchTab tab) {
@@ -1250,16 +1259,19 @@ void Widget::updateSearchTabs() {
 		: _openedForum
 		? _openedForum->channel().get()
 		: nullptr;
-	const auto topicShortLabel = topic
-		? Ui::Text::SingleCustomEmoji(Data::TopicIconEmojiEntity({
+	const auto topicShortLabel = !topic
+		? TextWithEntities()
+		: topic->iconId()
+		? Ui::Text::SingleCustomEmoji(
+			Data::SerializeCustomEmojiId(topic->iconId()))
+		: Ui::Text::SingleCustomEmoji(Data::TopicIconEmojiEntity({
 			.title = (topic->isGeneral()
 				? Data::ForumGeneralIconTitle()
 				: topic->title()),
 			.colorId = (topic->isGeneral()
 				? Data::ForumGeneralIconColor(st::windowSubTextFg->c)
 				: topic->colorId()),
-			}))
-		: TextWithEntities();
+			}));
 	const auto peerShortLabel = peer
 		? Ui::Text::SingleCustomEmoji(
 			session().data().customEmojiManager().peerUserpicEmojiData(
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
index 504321fabd51c..a8615ae11d955 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
@@ -97,31 +97,19 @@ bool IsHashtagSearchQuery(const QString &query) {
 	return true;
 }
 
-ChatSearchTabs::ChatSearchTabs(QWidget *parent, ChatSearchTab active)
+ChatSearchTabs::ChatSearchTabs(
+	QWidget *parent,
+	ChatSearchTab active,
+	Fn<std::any(Fn<void()>)> markedTextContext)
 : RpWidget(parent)
 , _tabs(std::make_unique<Ui::SettingsSlider>(this, st::dialogsSearchTabs))
 , _shadow(std::make_unique<Ui::PlainShadow>(this))
+, _markedTextContext(std::move(markedTextContext))
 , _active(active) {
-	for (const auto tab : {
-		ChatSearchTab::ThisTopic,
-		ChatSearchTab::ThisPeer,
-		ChatSearchTab::MyMessages,
-		ChatSearchTab::PublicPosts,
-	}) {
-		_list.push_back({ tab, TabLabel(tab) });
-	}
 	_tabs->move(st::dialogsSearchTabsPadding, 0);
 	_tabs->sectionActivated(
 	) | rpl::start_with_next([=](int index) {
-		for (const auto &tab : _list) {
-			if (tab.shortLabel.empty()) {
-				continue;
-			} else if (!index) {
-				_active = tab.value;
-				return;
-			}
-			--index;
-		}
+		_active = _list[index].value;
 	}, lifetime());
 }
 
@@ -131,40 +119,73 @@ void ChatSearchTabs::setTabShortLabels(
 		std::vector<ShortLabel> labels,
 		ChatSearchTab active,
 		ChatSearchPeerTabType peerTabType) {
-	for (const auto &label : labels) {
-		const auto i = ranges::find(_list, label.tab, &Tab::value);
-		Assert(i != end(_list));
-		i->shortLabel = std::move(label.label);
-		if (i->value == ChatSearchTab::ThisPeer) {
-			i->label = TabLabel(label.tab, peerTabType);
+	const auto &st = st::dialogsSearchTabs;
+	const auto &font = st.labelStyle.font;
+	_list.clear();
+	_list.reserve(labels.size());
+
+	auto widthTotal = 0;
+	for (const auto tab : {
+		ChatSearchTab::ThisTopic,
+		ChatSearchTab::ThisPeer,
+		ChatSearchTab::MyMessages,
+		ChatSearchTab::PublicPosts,
+	}) {
+		const auto i = ranges::find(labels, tab, &ShortLabel::tab);
+		if (i != end(labels) && !i->label.empty()) {
+			const auto label = TabLabel(tab, peerTabType);
+			const auto widthFull = font->width(label) + st.strictSkip;
+			_list.push_back({
+				.value = tab,
+				.label = label,
+				.shortLabel = i->label,
+				.widthFull = widthFull,
+			});
+			widthTotal += widthFull;
+		}
+	}
+	const auto widthSingleEmoji = st::emojiSize + st.strictSkip;
+	for (const auto tab : {
+		ChatSearchTab::PublicPosts,
+		ChatSearchTab::ThisTopic,
+		ChatSearchTab::ThisPeer,
+		ChatSearchTab::MyMessages,
+	}) {
+		const auto i = ranges::find(_list, tab, &Tab::value);
+		if (i != end(_list)) {
+			i->widthThresholdForShort = widthTotal;
+			widthTotal -= i->widthFull;
+			widthTotal += widthSingleEmoji;
 		}
 	}
-	refreshTabs(active);
+	refillTabs(active, width());
 }
 
 rpl::producer<ChatSearchTab> ChatSearchTabs::tabChanges() const {
 	return _active.changes();
 }
 
-void ChatSearchTabs::refreshTabs(ChatSearchTab active) {
-	auto index = 0;
-	auto labels = std::vector<QString>();
+void ChatSearchTabs::refillTabs(
+		ChatSearchTab active,
+		int newWidth) {
+	auto labels = std::vector<TextWithEntities>();
+	const auto available = newWidth - 2 * st::dialogsSearchTabsPadding;
 	for (const auto &tab : _list) {
-		if (tab.value == active) {
-			index = int(labels.size());
-			Assert(!tab.shortLabel.empty());
-			labels.push_back(tab.label);
-		} else if (!tab.shortLabel.empty()) {
-			labels.push_back(tab.label);
-		}
+		auto label = (available < tab.widthThresholdForShort)
+			? tab.shortLabel
+			: TextWithEntities{ tab.label };
+		labels.push_back(std::move(label));
 	}
-	_tabs->setSections(labels);
-	_tabs->setActiveSectionFast(index);
-	resizeToWidth(width());
+	_tabs->setSections(labels, _markedTextContext([=] { update(); }));
+
+	const auto i = ranges::find(_list, active, &Tab::value);
+	Assert(i != end(_list));
+	_tabs->setActiveSectionFast(i - begin(_list));
+	_tabs->resizeToWidth(newWidth);
 }
 
 int ChatSearchTabs::resizeGetHeight(int newWidth) {
-	_tabs->resizeToWidth(newWidth);
+	refillTabs(_active.current(), newWidth);
 	_shadow->setGeometry(
 		0,
 		_tabs->y() + _tabs->height() - st::lineWidth,
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h
index ba87f9f98d8a6..720bf573456a0 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h
@@ -34,7 +34,10 @@ enum class ChatSearchPeerTabType : uchar {
 
 class ChatSearchTabs final : public Ui::RpWidget {
 public:
-	ChatSearchTabs(QWidget *parent, ChatSearchTab active);
+	ChatSearchTabs(
+		QWidget *parent,
+		ChatSearchTab active,
+		Fn<std::any(Fn<void()>)> markedTextContext);
 	~ChatSearchTabs();
 
 	// A [custom] emoji to use when there is not enough space for text.
@@ -55,14 +58,18 @@ class ChatSearchTabs final : public Ui::RpWidget {
 		ChatSearchTab value = {};
 		QString label;
 		TextWithEntities shortLabel;
+		int widthFull = 0;
+		int widthThresholdForShort = 0;
 	};
 
 	void refreshTabs(ChatSearchTab active);
+	void refillTabs(ChatSearchTab active, int newWidth);
 	int resizeGetHeight(int newWidth) override;
 	void paintEvent(QPaintEvent *e) override;
 
 	const std::unique_ptr<Ui::SettingsSlider> _tabs;
 	const std::unique_ptr<Ui::PlainShadow> _shadow;
+	const Fn<std::any(Fn<void()>)> _markedTextContext;
 
 	std::vector<Tab> _list;
 	rpl::variable<ChatSearchTab> _active;
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
index e78de050a6799..53dc4e3dd0188 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
@@ -66,6 +66,13 @@ void DiscreteSlider::addSection(const QString &label) {
 	resizeToWidth(width());
 }
 
+void DiscreteSlider::addSection(
+		const TextWithEntities &label,
+		const std::any &context) {
+	_sections.push_back(Section(label, getLabelStyle(), context));
+	resizeToWidth(width());
+}
+
 void DiscreteSlider::setSections(const std::vector<QString> &labels) {
 	Assert(!labels.empty());
 
@@ -73,6 +80,22 @@ void DiscreteSlider::setSections(const std::vector<QString> &labels) {
 	for (const auto &label : labels) {
 		_sections.push_back(Section(label, getLabelStyle()));
 	}
+	refresh();
+}
+
+void DiscreteSlider::setSections(
+		const std::vector<TextWithEntities> &labels,
+		const std::any &context) {
+	Assert(!labels.empty());
+
+	_sections.clear();
+	for (const auto &label : labels) {
+		_sections.push_back(Section(label, getLabelStyle(), context));
+	}
+	refresh();
+}
+
+void DiscreteSlider::refresh() {
 	stopAnimation();
 	if (_activeIndex >= _sections.size()) {
 		_activeIndex = 0;
@@ -182,6 +205,13 @@ DiscreteSlider::Section::Section(
 : label(st, label) {
 }
 
+DiscreteSlider::Section::Section(
+		const TextWithEntities &label,
+		const style::TextStyle &st,
+		const std::any &context) {
+	this->label.setMarkedText(st, label, kMarkupTextOptions, context);
+}
+
 SettingsSlider::SettingsSlider(
 	QWidget *parent,
 	const style::SettingsSlider &st)
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
index 38cdb473d3e73..0cb930bf11861 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
@@ -22,7 +22,13 @@ class DiscreteSlider : public RpWidget {
 	~DiscreteSlider();
 
 	void addSection(const QString &label);
+	void addSection(
+		const TextWithEntities &label,
+		const std::any &context = {});
 	void setSections(const std::vector<QString> &labels);
+	void setSections(
+		const std::vector<TextWithEntities> &labels,
+		const std::any &context = {});
 	int activeSection() const {
 		return _activeIndex;
 	}
@@ -44,6 +50,10 @@ class DiscreteSlider : public RpWidget {
 
 	struct Section {
 		Section(const QString &label, const style::TextStyle &st);
+		Section(
+			const TextWithEntities &label,
+			const style::TextStyle &st,
+			const std::any &context);
 
 		int left = 0;
 		int width = 0;
@@ -75,6 +85,7 @@ class DiscreteSlider : public RpWidget {
 		_a_left.stop();
 		_a_width.stop();
 	}
+	void refresh();
 
 	void setSelectOnPress(bool selectOnPress);
 

From e00c6ecfb8931358c050818f869e7e4f2e2f2a1c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 May 2024 13:16:08 +0400
Subject: [PATCH 203/400] Show empty / placeholder in chats search.

---
 .../dialogs/dialogs_inner_widget.cpp          | 118 +++++++++++++++---
 .../dialogs/dialogs_inner_widget.h            |  12 +-
 Telegram/SourceFiles/dialogs/dialogs_key.cpp  |   1 +
 Telegram/SourceFiles/dialogs/dialogs_key.h    |   2 -
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  16 +--
 .../dialogs/ui/chat_search_empty.cpp          |  82 ++++++++++++
 .../dialogs/ui/chat_search_empty.h            |  43 +++++++
 .../dialogs/ui/dialogs_suggestions.cpp        |  50 +++-----
 .../dialogs/ui/dialogs_suggestions.h          |   4 +-
 Telegram/cmake/td_ui.cmake                    |   2 +
 10 files changed, 264 insertions(+), 66 deletions(-)
 create mode 100644 Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
 create mode 100644 Telegram/SourceFiles/dialogs/ui/chat_search_empty.h

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 274d889a90692..6767c52f9957c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "dialogs/dialogs_inner_widget.h"
 
 #include "dialogs/dialogs_three_state_icon.h"
+#include "dialogs/ui/chat_search_empty.h"
 #include "dialogs/ui/chat_search_tabs.h"
 #include "dialogs/ui/dialogs_layout.h"
 #include "dialogs/ui/dialogs_stories_content.h"
@@ -84,7 +85,7 @@ constexpr auto kHashtagResultsLimit = 5;
 constexpr auto kStartReorderThreshold = 30;
 constexpr auto kChatPreviewDelay = crl::time(1000);
 
-int FixedOnTopDialogsCount(not_null<Dialogs::IndexedList*> list) {
+[[nodiscard]] int FixedOnTopDialogsCount(not_null<Dialogs::IndexedList*> list) {
 	auto result = 0;
 	for (const auto &row : *list) {
 		if (!row->entry()->fixedOnTopIndex()) {
@@ -95,7 +96,7 @@ int FixedOnTopDialogsCount(not_null<Dialogs::IndexedList*> list) {
 	return result;
 }
 
-int PinnedDialogsCount(
+[[nodiscard]] int PinnedDialogsCount(
 		FilterId filterId,
 		not_null<Dialogs::IndexedList*> list) {
 	auto result = 0;
@@ -110,6 +111,52 @@ int PinnedDialogsCount(
 	return result;
 }
 
+[[nodiscard]] object_ptr<SearchEmpty> MakeSearchEmpty(
+		QWidget *parent,
+		SearchState state) {
+	const auto query = state.query.trimmed();
+	const auto hashtag = !query.isEmpty() && (query[0] == '#');
+	const auto trimmed = hashtag ? query.mid(1).trimmed() : query;
+	const auto waiting = trimmed.isEmpty()
+		&& state.tags.empty()
+		&& !state.fromPeer;
+	const auto icon = waiting
+		? SearchEmptyIcon::Search
+		: SearchEmptyIcon::NoResults;
+	auto text = TextWithEntities();
+	if (waiting) {
+		if (hashtag) {
+			text.append(tr::lng_search_tab_by_hashtag(tr::now));
+		} else {
+			text.append(
+				tr::lng_dlg_search_for_messages(tr::now)
+			).append('\n').append(Ui::Text::Link(tr::lng_cancel(tr::now)));
+		}
+	} else {
+		text.append(tr::lng_search_tab_no_results(
+			tr::now,
+			Ui::Text::Bold));
+		if (!trimmed.isEmpty()) {
+			text.append("\n").append(
+				tr::lng_search_tab_no_results_text(
+					tr::now,
+					lt_query,
+					trimmed));
+			if (hashtag) {
+				text.append("\n").append(
+					tr::lng_search_tab_no_results_retry(tr::now));
+			}
+		}
+	}
+	auto result = object_ptr<SearchEmpty>(
+		parent,
+		icon,
+		rpl::single(std::move(text)));
+	result->show();
+	result->resizeToWidth(parent->width());
+	return result;
+}
+
 } // namespace
 
 struct InnerWidget::CollapsedRow {
@@ -186,7 +233,7 @@ InnerWidget::InnerWidget(
 	session().data().contactsLoaded().changes(
 	) | rpl::start_with_next([=] {
 		refresh();
-		refreshEmptyLabel();
+		refreshEmpty();
 	}, lifetime());
 
 	session().data().itemRemoved(
@@ -1906,7 +1953,7 @@ void InnerWidget::resizeEvent(QResizeEvent *e) {
 	if (_searchTags) {
 		_searchTags->resizeToWidth(width() - 2 * _searchTagsLeft);
 	}
-	resizeEmptyLabel();
+	resizeEmpty();
 	moveCancelSearchButtons();
 }
 
@@ -2587,12 +2634,13 @@ void InnerWidget::applySearchState(SearchState state) {
 					append(owner->contactsNoChatsList());
 				}
 			}
-			refresh(true);
 		}
 		clearMouseSelection(true);
 	}
 	if (_state != WidgetState::Default) {
+		_searchLoading = true;
 		_searchMessages.fire({});
+		refresh(true);
 	}
 }
 
@@ -2791,6 +2839,10 @@ rpl::producer<> InnerWidget::cancelSearchFromUserRequests() const {
 	return _cancelSearchFromUser->clicks() | rpl::to_empty;
 }
 
+rpl::producer<> InnerWidget::cancelSearchRequests() const {
+	return _cancelSearch.events();
+}
+
 rpl::producer<Ui::ScrollToRequest> InnerWidget::mustScrollTo() const {
 	return _mustScrollTo.events();
 }
@@ -2888,6 +2940,8 @@ void InnerWidget::searchReceived(
 		HistoryItem *inject,
 		SearchRequestType type,
 		int fullCount) {
+	_searchLoading = false;
+
 	const auto uniquePeers = uniqueSearchResults();
 	if (type == SearchRequestType::FromStart
 		|| type == SearchRequestType::PeerFromStart) {
@@ -3018,7 +3072,7 @@ void InnerWidget::refresh(bool toTop) {
 	} else if (needCollapsedRowsRefresh()) {
 		return refreshWithCollapsedRows(toTop);
 	}
-	refreshEmptyLabel();
+	refreshEmpty();
 	if (_searchTags) {
 		_searchTagsLeft = st::dialogsFilterSkip
 			+ st::dialogsFilterPadding.x();
@@ -3032,7 +3086,11 @@ void InnerWidget::refresh(bool toTop) {
 			h = dialogsOffset() + _shownList->height();
 		}
 	} else if (_state == WidgetState::Filtered) {
-		if (_waitingForSearch) {
+		if (_searchEmpty && !_searchEmpty->isHidden()) {
+			h = searchedOffset() + st::recentPeersEmptyHeightMin;
+			_searchEmpty->setMinimalHeight(st::recentPeersEmptyHeightMin);
+			_searchEmpty->move(0, h - st::recentPeersEmptyHeightMin);
+		} else if (_waitingForSearch) {
 			h = searchedOffset() + (_searchResults.size() * _st->height) + ((_searchResults.empty() && !_searchState.inChat) ? -st::searchedBarHeight : 0);
 		} else {
 			h = searchedOffset() + (_searchResults.size() * _st->height);
@@ -3047,7 +3105,32 @@ void InnerWidget::refresh(bool toTop) {
 	update();
 }
 
-void InnerWidget::refreshEmptyLabel() {
+void InnerWidget::refreshEmpty() {
+	if (_state == WidgetState::Filtered) {
+		const auto empty = _filterResults.empty()
+			&& _searchResults.empty()
+			&& _peerSearchResults.empty()
+			&& _hashtagResults.empty();
+		if (_searchLoading || !empty) {
+			if (_searchEmpty) {
+				_searchEmpty->hide();
+			}
+		} else if (_searchEmptyState != _searchState) {
+			_searchEmptyState = _searchState;
+			_searchEmpty = MakeSearchEmpty(this, _searchState);
+			_searchEmpty->linkClicks() | rpl::start_with_next([=] {
+				_cancelSearch.fire({});
+			}, _searchEmpty->lifetime());
+			if (_controller->session().data().chatsListLoaded()) {
+				_searchEmpty->animate();
+			}
+		} else if (_searchEmpty) {
+			_searchEmpty->show();
+		}
+	} else {
+		_searchEmpty.destroy();
+	}
+
 	const auto data = &session().data();
 	const auto state = !_shownList->empty()
 		? EmptyState::None
@@ -3100,7 +3183,7 @@ void InnerWidget::refreshEmptyLabel() {
 		return result;
 	});
 	_empty.create(this, std::move(full), st::dialogsEmptyLabel);
-	resizeEmptyLabel();
+	resizeEmpty();
 	_empty->overrideLinkClickHandler([=] {
 		if (_emptyState == EmptyState::NoContacts) {
 			_controller->showAddContact();
@@ -3114,13 +3197,16 @@ void InnerWidget::refreshEmptyLabel() {
 	_empty->setVisible(_state == WidgetState::Default);
 }
 
-void InnerWidget::resizeEmptyLabel() {
-	if (!_empty) {
-		return;
+void InnerWidget::resizeEmpty() {
+	if (_empty) {
+		const auto skip = st::dialogsEmptySkip;
+		_empty->resizeToWidth(width() - 2 * skip);
+		_empty->move(skip, (st::dialogsEmptyHeight - _empty->height()) / 2);
+	}
+	if (_searchEmpty) {
+		_searchEmpty->resizeToWidth(width());
+		_searchEmpty->move(0, searchedOffset());
 	}
-	const auto skip = st::dialogsEmptySkip;
-	_empty->resizeToWidth(width() - 2 * skip);
-	_empty->move(skip, (st::dialogsEmptyHeight - _empty->height()) / 2);
 }
 
 void InnerWidget::clearMouseSelection(bool clearSelection) {
@@ -3481,7 +3567,7 @@ void InnerWidget::switchToFilter(FilterId filterId) {
 		refreshShownList();
 		refreshWithCollapsedRows(true);
 	}
-	refreshEmptyLabel();
+	refreshEmpty();
 	{
 		const auto skip = found
 			// Don't save a scroll state for very flexible chat filters.
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 8cde8de924431..a7e3ae619df15 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -60,6 +60,7 @@ class Row;
 class FakeRow;
 class IndexedList;
 class SearchTags;
+class SearchEmpty;
 
 struct ChosenRow {
 	Key key;
@@ -119,8 +120,8 @@ class InnerWidget final : public Ui::RpWidget {
 
 	void clearFilter();
 	void refresh(bool toTop = false);
-	void refreshEmptyLabel();
-	void resizeEmptyLabel();
+	void refreshEmpty();
+	void resizeEmpty();
 
 	[[nodiscard]] bool isUserpicPress() const;
 	[[nodiscard]] bool isUserpicPressOnWide() const;
@@ -158,6 +159,7 @@ class InnerWidget final : public Ui::RpWidget {
 	void setLoadMoreFilteredCallback(Fn<void()> callback);
 	[[nodiscard]] rpl::producer<> listBottomReached() const;
 	[[nodiscard]] rpl::producer<> cancelSearchFromUserRequests() const;
+	[[nodiscard]] rpl::producer<> cancelSearchRequests() const;
 	[[nodiscard]] rpl::producer<ChosenRow> chosenRow() const;
 	[[nodiscard]] rpl::producer<> updated() const;
 
@@ -386,7 +388,6 @@ class InnerWidget final : public Ui::RpWidget {
 		const Ui::Text::String &text) const;
 	void refreshSearchInChatLabel();
 	void repaintSearchResult(int index);
-	void paintEmpty(QPainter &p, int top);
 
 	Ui::VideoUserpic *validateVideoUserpic(not_null<Row*> row);
 	Ui::VideoUserpic *validateVideoUserpic(not_null<History*> history);
@@ -395,7 +396,6 @@ class InnerWidget final : public Ui::RpWidget {
 	void clearSearchResults(bool clearPeerSearchResults = true);
 	void updateSelectedRow(Key key = Key());
 	void trackSearchResultsHistory(not_null<History*> history);
-	void trackSearchResultsForum(Data::Forum *forum);
 
 	[[nodiscard]] QBrush currentBg() const;
 	[[nodiscard]] Key computeChatPreviewRow() const;
@@ -485,8 +485,11 @@ class InnerWidget final : public Ui::RpWidget {
 
 	WidgetState _state = WidgetState::Default;
 
+	object_ptr<SearchEmpty> _searchEmpty = { nullptr };
+	SearchState _searchEmptyState;
 	object_ptr<Ui::FlatLabel> _empty = { nullptr };
 	object_ptr<Ui::IconButton> _cancelSearchFromUser;
+	rpl::event_stream<> _cancelSearch;
 
 	Ui::DraggingScrollManager _draggingScroll;
 
@@ -526,6 +529,7 @@ class InnerWidget final : public Ui::RpWidget {
 	bool _geometryInited = false;
 
 	bool _savedSublists = false;
+	bool _searchLoading = false;
 
 	base::unique_qptr<Ui::PopupMenu> _menu;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_key.cpp b/Telegram/SourceFiles/dialogs/dialogs_key.cpp
index 8a8cf398cdbde..7c1be62aa94a4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_key.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_key.cpp
@@ -87,6 +87,7 @@ PeerData *Key::peer() const {
 
 [[nodiscard]] bool SearchState::empty() const {
 	return !inChat
+		&& tags.empty()
 		&& QStringView(query).trimmed().isEmpty();
 }
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_key.h b/Telegram/SourceFiles/dialogs/dialogs_key.h
index a9278e08c7413..2f631288e2b2f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_key.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_key.h
@@ -147,6 +147,4 @@ struct SearchState {
 		const SearchState&) = default;
 };
 
-;
-
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index db8724a61b8c8..67155eb3df5b4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -345,6 +345,10 @@ Widget::Widget(
 		}
 		applySearchState(std::move(copy));
 	}, lifetime());
+	_inner->cancelSearchRequests(
+	) | rpl::start_with_next([=] {
+		applySearchState({});
+	}, lifetime());
 	_inner->chosenRow(
 	) | rpl::start_with_next([=](const ChosenRow &row) {
 		chosenRow(row);
@@ -1988,6 +1992,9 @@ bool Widget::search(bool inCache) {
 
 	auto result = false;
 	const auto query = _searchState.query.trimmed();
+	const auto trimmed = (query.isEmpty() || query[0] != '#')
+		? query
+		: query.mid(1).trimmed();
 	const auto inPeer = searchInPeer();
 	const auto fromPeer = searchFromPeer();
 	const auto &inTags = searchInTags();
@@ -1995,9 +2002,7 @@ bool Widget::search(bool inCache) {
 	const auto fromStartType = inPeer
 		? SearchRequestType::PeerFromStart
 		: SearchRequestType::FromStart;
-	const auto skipRequest = (query.isEmpty() && !fromPeer && inTags.empty())
-		|| (tab == ChatSearchTab::PublicPosts && query.size() < 2);
-	if (skipRequest) {
+	if (trimmed.isEmpty() && !fromPeer && inTags.empty()) {
 		cancelSearchRequest();
 		searchApplyEmpty(fromStartType, 0);
 		_api.request(base::take(_peerSearchRequest)).cancel();
@@ -2021,10 +2026,7 @@ bool Widget::search(bool inCache) {
 			_searchNextRate = 0;
 			_searchFull = _searchFullMigrated = false;
 			cancelSearchRequest();
-			searchReceived(
-				fromStartType,
-				i->second,
-				0);
+			searchReceived(fromStartType, i->second, 0);
 			result = true;
 		}
 	} else if (_searchQuery != query
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
new file mode 100644
index 0000000000000..855112f850e73
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
@@ -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
+*/
+#include "dialogs/ui/chat_search_empty.h"
+
+#include "base/object_ptr.h"
+#include "lottie/lottie_icon.h"
+#include "settings/settings_common.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_dialogs.h"
+
+namespace Dialogs {
+
+SearchEmpty::SearchEmpty(
+	QWidget *parent,
+	Icon icon,
+	rpl::producer<TextWithEntities> text)
+: RpWidget(parent) {
+	setup(icon, std::move(text));
+}
+
+void SearchEmpty::setMinimalHeight(int minimalHeight) {
+	const auto minimal = st::recentPeersEmptyHeightMin;
+	resize(width(), std::max(minimalHeight, minimal));
+}
+
+void SearchEmpty::setup(Icon icon, rpl::producer<TextWithEntities> text) {
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		this,
+		std::move(text),
+		st::defaultPeerListAbout);
+	label->setClickHandlerFilter([=](const auto &, Qt::MouseButton button) {
+		if (button == Qt::LeftButton) {
+			_linkClicks.fire({});
+		}
+		return false;
+	});
+	const auto size = st::recentPeersEmptySize;
+	const auto animation = [&] {
+		switch (icon) {
+		case Icon::Search: return u"search"_q;
+		case Icon::NoResults: return u"noresults"_q;
+		}
+		Unexpected("Icon in SearchEmpty::setup.");
+	}();
+	const auto [widget, animate] = Settings::CreateLottieIcon(
+		this,
+		{
+			.name = animation,
+			.sizeOverride = { size, size },
+		},
+		st::recentPeersEmptyMargin);
+	const auto animated = widget.data();
+
+	sizeValue() | rpl::start_with_next([=](QSize size) {
+		const auto padding = st::recentPeersEmptyMargin;
+		const auto paddings = padding.left() + padding.right();
+		label->resizeToWidth(size.width() - paddings);
+		const auto x = (size.width() - animated->width()) / 2;
+		const auto y = (size.height() - animated->height()) / 3;
+		const auto top = y + animated->height() + st::recentPeersEmptySkip;
+		const auto sub = std::max(top + label->height() - size.height(), 0);
+		animated->move(x, y - sub);
+		label->move((size.width() - label->width()) / 2, top - sub);
+	}, lifetime());
+
+	_animate = [animate] {
+		animate(anim::repeat::once);
+	};
+}
+
+void SearchEmpty::animate() {
+	if (const auto onstack = _animate) {
+		onstack();
+	}
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h
new file mode 100644
index 0000000000000..6ddf52676cf6e
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h
@@ -0,0 +1,43 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+
+namespace Dialogs {
+
+enum class SearchEmptyIcon {
+	Search,
+	NoResults,
+};
+
+class SearchEmpty final : public Ui::RpWidget {
+public:
+	using Icon = SearchEmptyIcon;
+
+	SearchEmpty(
+		QWidget *parent,
+		Icon icon,
+		rpl::producer<TextWithEntities> text);
+
+	void setMinimalHeight(int minimalHeight);
+	[[nodiscard]] rpl::producer<> linkClicks() const {
+		return _linkClicks.events();
+	}
+
+	void animate();
+
+private:
+	void setup(Icon icon, rpl::producer<TextWithEntities> text);
+
+	Fn<void()> _animate;
+	rpl::event_stream<> _linkClicks;
+
+};
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 868b3b74c037b..9a86cca750fc8 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -20,12 +20,13 @@ For license and copyright information please follow this link:
 #include "data/data_peer_values.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "dialogs/ui/chat_search_empty.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
-#include "lottie/lottie_icon.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/discrete_sliders.h"
@@ -1360,53 +1361,30 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
 }
 
 object_ptr<Ui::SlideWrap<>> Suggestions::setupEmptyRecent() {
-	return setupEmpty(_chatsContent, "search", tr::lng_recent_none());
+	const auto icon = SearchEmptyIcon::Search;
+	return setupEmpty(_chatsContent, icon, tr::lng_recent_none());
 }
 
 object_ptr<Ui::SlideWrap<>> Suggestions::setupEmptyChannels() {
-	return setupEmpty(
-		_channelsContent,
-		"noresults",
-		tr::lng_channels_none_about());
+	const auto icon = SearchEmptyIcon::NoResults;
+	return setupEmpty(_channelsContent, icon, tr::lng_channels_none_about());
 }
 
 object_ptr<Ui::SlideWrap<>> Suggestions::setupEmpty(
 		not_null<QWidget*> parent,
-		const QString &animation,
+		SearchEmptyIcon icon,
 		rpl::producer<QString> text) {
-	auto content = object_ptr<Ui::RpWidget>(parent);
-	const auto raw = content.data();
-
-	const auto label = Ui::CreateChild<Ui::FlatLabel>(
-		raw,
-		std::move(text),
-		st::defaultPeerListAbout);
-	const auto size = st::recentPeersEmptySize;
-	const auto [widget, animate] = Settings::CreateLottieIcon(
-		raw,
-		{
-			.name = animation,
-			.sizeOverride = { size, size },
-		},
-		st::recentPeersEmptyMargin);
-	const auto icon = widget.data();
+	auto content = object_ptr<SearchEmpty>(
+		parent,
+		icon,
+		std::move(text) | Ui::Text::ToWithEntities());
 
+	const auto raw = content.data();
 	rpl::combine(
 		_chatsScroll->heightValue(),
 		_topPeersWrap->heightValue()
 	) | rpl::start_with_next([=](int height, int top) {
-		raw->resize(
-			raw->width(),
-			std::max(height - top, st::recentPeersEmptyHeightMin));
-	}, raw->lifetime());
-
-	raw->sizeValue() | rpl::start_with_next([=](QSize size) {
-		const auto x = (size.width() - icon->width()) / 2;
-		const auto y = (size.height() - icon->height()) / 3;
-		icon->move(x, y);
-		label->move(
-			(size.width() - label->width()) / 2,
-			y + icon->height() + st::recentPeersEmptySkip);
+		raw->setMinimalHeight(height - top);
 	}, raw->lifetime());
 
 	auto result = object_ptr<Ui::SlideWrap<>>(
@@ -1417,7 +1395,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupEmpty(
 	result->toggledValue() | rpl::filter([=](bool shown) {
 		return shown && _controller->session().data().chatsListLoaded();
 	}) | rpl::start_with_next([=] {
-		animate(anim::repeat::once);
+		raw->animate();
 	}, raw->lifetime());
 
 	return result;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index 947bf2fa9d7d8..27b9b527fdc8a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -34,6 +34,8 @@ class SessionController;
 
 namespace Dialogs {
 
+enum class SearchEmptyIcon;
+
 struct RecentPeersList {
 	std::vector<not_null<PeerData*>> list;
 };
@@ -112,7 +114,7 @@ class Suggestions final : public Ui::RpWidget {
 		-> object_ptr<Ui::SlideWrap<Ui::RpWidget>>;
 	[[nodiscard]] object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupEmpty(
 		not_null<QWidget*> parent,
-		const QString &animation,
+		SearchEmptyIcon icon,
 		rpl::producer<QString> text);
 
 	void switchTab(Tab tab);
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 533fe85ef17d5..adf5b8f11ec7b 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -85,6 +85,8 @@ PRIVATE
     data/data_subscription_option.h
 
     dialogs/dialogs_three_state_icon.h
+    dialogs/ui/chat_search_empty.cpp
+    dialogs/ui/chat_search_empty.h
     dialogs/ui/chat_search_tabs.cpp
     dialogs/ui/chat_search_tabs.h
     dialogs/ui/dialogs_stories_list.cpp

From 1865fd382c4e38c95cdfa3c07307c208f7f5757b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 May 2024 13:58:37 +0400
Subject: [PATCH 204/400] Show loading placeholders in chats list.

---
 .../dialogs/dialogs_inner_widget.cpp          | 45 +++++++++++++------
 .../dialogs/dialogs_inner_widget.h            |  5 +--
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  4 +-
 .../ui/effects/loading_element.cpp            | 31 +++++++++++++
 .../SourceFiles/ui/effects/loading_element.h  |  6 +++
 5 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 6767c52f9957c..bae1e94e745dd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -64,6 +64,7 @@ For license and copyright information please follow this link:
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
+#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"
@@ -936,7 +937,17 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		}
 
 		const auto showUnreadInSearchResults = uniqueSearchResults();
-		if (!_searchResults.empty()) {
+		if (_searchResults.empty()) {
+			if (_loadingAnimation) {
+				const auto text = tr::lng_contacts_loading(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);
+				p.translate(0, st::searchedBarHeight);
+				top += st::searchedBarHeight;
+			}
+		} else {
 			const auto text = showUnreadInSearchResults
 				? u"Search results"_q
 				: tr::lng_search_found_results(
@@ -1442,7 +1453,7 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 				updateSelectedRow();
 			}
 		}
-		if (!_waitingForSearch && !_searchResults.empty()) {
+		if (!_searchResults.empty()) {
 			auto skip = searchedOffset();
 			auto searchedSelected = (mouseY >= skip) ? ((mouseY - skip) / _st->height) : -1;
 			if (searchedSelected < 0 || searchedSelected >= _searchResults.size()) {
@@ -2602,7 +2613,6 @@ void InnerWidget::applySearchState(SearchState state) {
 			clearFilter();
 		} else {
 			setState(WidgetState::Filtered);
-			_waitingForSearch = true;
 			_filterResults.clear();
 			_filterResultsGlobal.clear();
 			const auto append = [&](not_null<IndexedList*> list) {
@@ -2986,13 +2996,6 @@ void InnerWidget::searchReceived(
 	} else {
 		_searchedCount = fullCount;
 	}
-	if (_waitingForSearch
-		&& (!_searchResults.empty()
-			|| !_searchInMigrated
-			|| type == SearchRequestType::MigratedFromStart
-			|| type == SearchRequestType::MigratedFromOffset)) {
-		_waitingForSearch = false;
-	}
 
 	refresh();
 }
@@ -3090,8 +3093,8 @@ void InnerWidget::refresh(bool toTop) {
 			h = searchedOffset() + st::recentPeersEmptyHeightMin;
 			_searchEmpty->setMinimalHeight(st::recentPeersEmptyHeightMin);
 			_searchEmpty->move(0, h - st::recentPeersEmptyHeightMin);
-		} else if (_waitingForSearch) {
-			h = searchedOffset() + (_searchResults.size() * _st->height) + ((_searchResults.empty() && !_searchState.inChat) ? -st::searchedBarHeight : 0);
+		} else if (_loadingAnimation) {
+			h = searchedOffset() + _loadingAnimation->height();
 		} else {
 			h = searchedOffset() + (_searchResults.size() * _st->height);
 		}
@@ -3127,8 +3130,21 @@ void InnerWidget::refreshEmpty() {
 		} else if (_searchEmpty) {
 			_searchEmpty->show();
 		}
+
+		if (!_searchLoading || !empty) {
+			_loadingAnimation.destroy();
+		} else if (!_loadingAnimation) {
+			_loadingAnimation = Ui::CreateLoadingDialogRowWidget(
+				this,
+				*_st,
+				2);
+			_loadingAnimation->resizeToWidth(width());
+			_loadingAnimation->move(0, searchedOffset());
+			_loadingAnimation->show();
+		}
 	} else {
 		_searchEmpty.destroy();
+		_loadingAnimation.destroy();
 	}
 
 	const auto data = &session().data();
@@ -3207,6 +3223,10 @@ void InnerWidget::resizeEmpty() {
 		_searchEmpty->resizeToWidth(width());
 		_searchEmpty->move(0, searchedOffset());
 	}
+	if (_loadingAnimation) {
+		_loadingAnimation->resizeToWidth(width());
+		_loadingAnimation->move(0, searchedOffset());
+	}
 }
 
 void InnerWidget::clearMouseSelection(bool clearSelection) {
@@ -3269,7 +3289,6 @@ void InnerWidget::clearFilter() {
 	if (_state == WidgetState::Filtered || _searchState.inChat) {
 		if (_searchState.inChat) {
 			setState(WidgetState::Filtered);
-			_waitingForSearch = true;
 		} else {
 			setState(WidgetState::Default);
 		}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index a7e3ae619df15..b41a4aeb3c5c0 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -141,9 +141,6 @@ class InnerWidget final : public Ui::RpWidget {
 	[[nodiscard]] not_null<const style::DialogRow*> st() const {
 		return _st;
 	}
-	[[nodiscard]] bool waitingForSearch() const {
-		return _waitingForSearch;
-	}
 	[[nodiscard]] bool hasFilteredResults() const;
 
 	void applySearchState(SearchState state);
@@ -467,7 +464,6 @@ class InnerWidget final : public Ui::RpWidget {
 	int _filteredSelected = -1;
 	int _filteredPressed = -1;
 
-	bool _waitingForSearch = false;
 	EmptyState _emptyState = EmptyState::None;
 
 	QString _peerSearchQuery;
@@ -485,6 +481,7 @@ class InnerWidget final : public Ui::RpWidget {
 
 	WidgetState _state = WidgetState::Default;
 
+	object_ptr<Ui::RpWidget> _loadingAnimation = { nullptr };
 	object_ptr<SearchEmpty> _searchEmpty = { nullptr };
 	SearchState _searchEmptyState;
 	object_ptr<Ui::FlatLabel> _empty = { nullptr };
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 67155eb3df5b4..fa1c71a5f1425 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -448,7 +448,7 @@ Widget::Widget(
 	_inner->setLoadMoreCallback([=] {
 		const auto state = _inner->state();
 		if (state == WidgetState::Filtered
-			&& (!_inner->waitingForSearch()
+			&& (!_searchFull
 				|| (_searchInMigrated
 					&& _searchFull
 					&& !_searchFullMigrated))) {
@@ -1936,7 +1936,7 @@ void Widget::submit() {
 	const auto state = _inner->state();
 	if (state == WidgetState::Default
 		|| (state == WidgetState::Filtered
-			&& (!_inner->waitingForSearch() || _inner->hasFilteredResults()))) {
+			&& _inner->hasFilteredResults())) {
 		_inner->selectSkip(1);
 		_inner->chooseRow();
 	} else {
diff --git a/Telegram/SourceFiles/ui/effects/loading_element.cpp b/Telegram/SourceFiles/ui/effects/loading_element.cpp
index 5e30157c2c7be..5cc2e5e90903b 100644
--- a/Telegram/SourceFiles/ui/effects/loading_element.cpp
+++ b/Telegram/SourceFiles/ui/effects/loading_element.cpp
@@ -15,6 +15,7 @@ For license and copyright information please follow this link:
 #include "ui/rect.h"
 #include "ui/rp_widget.h"
 #include "styles/style_basic.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_widgets.h"
 
 namespace Ui {
@@ -63,10 +64,28 @@ void LoadingText::paint(QPainter &p, int width) {
 		h / 2);
 }
 
+[[nodiscard]] const style::PeerListItem &PeerListItemFromDialogRow(
+		rpl::lifetime &lifetime,
+		const style::DialogRow &st) {
+	using namespace style;
+	const auto item = lifetime.make_state<PeerListItem>(PeerListItem{
+		.height = st.height,
+		.photoPosition = QPoint(st.padding.left(), st.padding.top()),
+		.namePosition = QPoint(st.nameLeft, st.nameTop),
+		.nameStyle = st::semiboldTextStyle,
+		.statusPosition = QPoint(st.textLeft, st.textTop),
+		.photoSize = st.photoSize,
+	});
+	return *item;
+}
+
 class LoadingPeerListItem final : public LoadingElement {
 public:
 	LoadingPeerListItem(const style::PeerListItem &st) : _st(st) {
 	}
+	LoadingPeerListItem(const style::DialogRow &st)
+	: _st(PeerListItemFromDialogRow(_lifetime, st)) {
+	}
 
 	[[nodiscard]] int height() const override {
 		return _st.height;
@@ -114,6 +133,7 @@ class LoadingPeerListItem final : public LoadingElement {
 	}
 
 private:
+	rpl::lifetime _lifetime;
 	const style::PeerListItem &_st;
 
 };
@@ -220,4 +240,15 @@ object_ptr<Ui::RpWidget> CreateLoadingPeerListItemWidget(
 		st);
 }
 
+object_ptr<Ui::RpWidget> CreateLoadingDialogRowWidget(
+		not_null<Ui::RpWidget*> parent,
+		const style::DialogRow &st,
+		int lines) {
+	return CreateLoadingElementWidget<LoadingPeerListItem>(
+		parent,
+		lines,
+		rpl::single(false),
+		st);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/loading_element.h b/Telegram/SourceFiles/ui/effects/loading_element.h
index ab3b0d17e6809..757250f0a9bce 100644
--- a/Telegram/SourceFiles/ui/effects/loading_element.h
+++ b/Telegram/SourceFiles/ui/effects/loading_element.h
@@ -13,6 +13,7 @@ class object_ptr;
 namespace style {
 struct FlatLabel;
 struct PeerListItem;
+struct DialogRow;
 } // namespace style
 
 namespace Ui {
@@ -30,4 +31,9 @@ object_ptr<Ui::RpWidget> CreateLoadingPeerListItemWidget(
 	const style::PeerListItem &st,
 	int lines);
 
+object_ptr<Ui::RpWidget> CreateLoadingDialogRowWidget(
+	not_null<Ui::RpWidget*> parent,
+	const style::DialogRow &st,
+	int lines);
+
 } // namespace Ui

From 1ce49df123a904a2a745047e7b440d0e07ec0030 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 May 2024 14:36:24 +0400
Subject: [PATCH 205/400] Fix saved / replies userpics in chats search.

---
 .../data/stickers/data_custom_emoji.cpp       | 26 ++++++++++---
 .../data/stickers/data_custom_emoji.h         |  3 +-
 Telegram/SourceFiles/dialogs/dialogs.style    |  2 +-
 .../dialogs/dialogs_inner_widget.cpp          |  1 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  8 +++-
 .../SourceFiles/ui/dynamic_thumbnails.cpp     | 39 +++++++++++++++++++
 Telegram/SourceFiles/ui/dynamic_thumbnails.h  |  1 +
 7 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index c7eea5d48ffd3..0e47aa390f98b 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -598,13 +598,21 @@ std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::userpic(
 	if (v.size() != 5 && v.size() != 1) {
 		return nullptr;
 	}
-	const auto id = PeerId(v[0].toULongLong());
+	auto image = std::shared_ptr<Ui::DynamicImage>();
+	if (v[0] == u"self"_q) {
+		image = Ui::MakeSavedMessagesThumbnail();
+	} else if (v[0] == u"replies"_q) {
+		image = Ui::MakeRepliesThumbnail();
+	} else {
+		const auto id = PeerId(v[0].toULongLong());
+		image = Ui::MakeUserpicThumbnail(_owner->peer(id));
+	}
 	const auto padding = (v.size() == 5)
 		? QMargins(v[1].toInt(), v[2].toInt(), v[3].toInt(), v[4].toInt())
 		: QMargins();
 	return std::make_unique<Ui::CustomEmoji::DynamicImageEmoji>(
 		data.toString(),
-		Ui::MakeUserpicThumbnail(_owner->peer(id)),
+		std::move(image),
 		std::move(update),
 		padding,
 		size);
@@ -992,10 +1000,16 @@ QString CustomEmojiManager::registerInternalEmoji(
 
 [[nodiscard]] QString CustomEmojiManager::peerUserpicEmojiData(
 		not_null<PeerData*> peer,
-		QMargins padding) {
-	return UserpicEmojiPrefix()
-		+ QString::number(peer->id.value)
-		+ InternalPadding(padding);
+		QMargins padding,
+		bool respectSavedRepliesEtc) {
+	const auto id = !respectSavedRepliesEtc
+		? QString::number(peer->id.value)
+		: peer->isSelf()
+		? u"self"_q
+		: peer->isRepliesChat()
+		? u"replies"_q
+		: QString::number(peer->id.value);
+	return UserpicEmojiPrefix() + id + InternalPadding(padding);
 }
 
 int FrameSizeFromTag(SizeTag tag) {
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
index 1cbbe0de983cf..d7a6c46cad319 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
@@ -94,7 +94,8 @@ class CustomEmojiManager final : public base::has_weak_ptr {
 
 	[[nodiscard]] QString peerUserpicEmojiData(
 		not_null<PeerData*> peer,
-		QMargins padding = {});
+		QMargins padding = {},
+		bool respectSavedRepliesEtc = false);
 
 	[[nodiscard]] uint64 coloredSetId() const;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index caa3526e20a8f..4a910953ea228 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -522,7 +522,7 @@ forumTopicRow: DialogRow(defaultDialogRow) {
 	photoSize: 20px;
 	nameLeft: 39px;
 	nameTop: 7px;
-	textLeft: 68px;
+	textLeft: 39px;
 	textTop: 29px;
 	unreadMarkDiameter: 8px;
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index bae1e94e745dd..9e79f3ac2539f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -3145,6 +3145,7 @@ void InnerWidget::refreshEmpty() {
 	} else {
 		_searchEmpty.destroy();
 		_loadingAnimation.destroy();
+		_searchEmptyState = {};
 	}
 
 	const auto data = &session().data();
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index fa1c71a5f1425..b3b5a31f9089e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1279,11 +1279,15 @@ void Widget::updateSearchTabs() {
 	const auto peerShortLabel = peer
 		? Ui::Text::SingleCustomEmoji(
 			session().data().customEmojiManager().peerUserpicEmojiData(
-				peer))
+				peer,
+				{},
+				true))
 		: sublist
 		? Ui::Text::SingleCustomEmoji(
 			session().data().customEmojiManager().peerUserpicEmojiData(
-				sublist->peer()))
+				sublist->peer(),
+				{},
+				true))
 		: TextWithEntities();
 	const auto myShortLabel = DefaultShortLabel(ChatSearchTab::MyMessages);
 	const auto publicShortLabel = _searchingHashtag
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
index fb977e6d705c2..b9ea1ad0e5ae0 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
@@ -130,6 +130,17 @@ class SavedMessagesUserpic final : public DynamicImage {
 
 };
 
+class RepliesUserpic final : public DynamicImage {
+public:
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	QImage _frame;
+	int _paletteVersion = 0;
+
+};
+
 PeerUserpic::PeerUserpic(not_null<PeerData*> peer, bool forceRound)
 : _peer(peer)
 , _forceRound(forceRound) {
@@ -358,6 +369,30 @@ QImage SavedMessagesUserpic::image(int size) {
 void SavedMessagesUserpic::subscribeToUpdates(Fn<void()> callback) {
 }
 
+QImage RepliesUserpic::image(int size) {
+	const auto good = (_frame.width() == size * _frame.devicePixelRatio());
+	const auto paletteVersion = style::PaletteVersion();
+	if (!good || _paletteVersion != paletteVersion) {
+		_paletteVersion = paletteVersion;
+
+		const auto ratio = style::DevicePixelRatio();
+		if (!good) {
+			_frame = QImage(
+				QSize(size, size) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_frame.setDevicePixelRatio(ratio);
+		}
+		_frame.fill(Qt::transparent);
+
+		auto p = Painter(&_frame);
+		Ui::EmptyUserpic::PaintRepliesMessages(p, 0, 0, size, size);
+	}
+	return _frame;
+}
+
+void RepliesUserpic::subscribeToUpdates(Fn<void()> callback) {
+}
+
 } // namespace
 
 std::shared_ptr<DynamicImage> MakeUserpicThumbnail(
@@ -370,6 +405,10 @@ std::shared_ptr<DynamicImage> MakeSavedMessagesThumbnail() {
 	return std::make_shared<SavedMessagesUserpic>();
 }
 
+std::shared_ptr<DynamicImage> MakeRepliesThumbnail() {
+	return std::make_shared<RepliesUserpic>();
+}
+
 std::shared_ptr<DynamicImage> MakeStoryThumbnail(
 		not_null<Data::Story*> story) {
 	using Result = std::shared_ptr<DynamicImage>;
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.h b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
index ad8556d5d8c06..4b4e0e5530cf9 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.h
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
@@ -21,6 +21,7 @@ class DynamicImage;
 	not_null<PeerData*> peer,
 	bool forceRound = false);
 [[nodiscard]] std::shared_ptr<DynamicImage> MakeSavedMessagesThumbnail();
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeRepliesThumbnail();
 [[nodiscard]] std::shared_ptr<DynamicImage> MakeStoryThumbnail(
 	not_null<Data::Story*> story);
 

From 39e03c3ca7265f722cf972add9249e4b8ca2385f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 May 2024 14:15:24 +0400
Subject: [PATCH 206/400] Update API scheme to layer181.

---
 Telegram/SourceFiles/api/api_updates.cpp      |  6 ++--
 .../data/business/data_shortcut_messages.cpp  |  3 +-
 .../data/components/scheduled_messages.cpp    |  6 ++--
 Telegram/SourceFiles/data/data_session.cpp    |  3 +-
 .../admin_log/history_admin_log_item.cpp      |  3 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 30 +++++++++++++++++--
 .../SourceFiles/payments/payments_form.cpp    |  5 +++-
 .../settings/settings_privacy_controllers.cpp |  3 +-
 8 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 6613a1df3dcf4..56f8a8da4cc0b 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -1138,7 +1138,8 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				MTPVector<MTPRestrictionReason>(),
 				MTP_int(d.vttl_period().value_or_empty()),
 				MTPint(), // quick_reply_shortcut_id
-				MTPlong()), // effect
+				MTPlong(), // effect
+				MTPFactCheck()),
 			MessageFlags(),
 			NewMessageType::Unread);
 	} break;
@@ -1174,7 +1175,8 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				MTPVector<MTPRestrictionReason>(),
 				MTP_int(d.vttl_period().value_or_empty()),
 				MTPint(), // quick_reply_shortcut_id
-				MTPlong()), // effect
+				MTPlong(), // effect
+				MTPFactCheck()),
 			MessageFlags(),
 			NewMessageType::Unread);
 	} break;
diff --git a/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp b/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
index 57f8753a28c94..39b21154544ee 100644
--- a/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
@@ -88,7 +88,8 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			MTPVector<MTPRestrictionReason>(),
 			MTP_int(data.vttl_period().value_or_empty()),
 			MTP_int(shortcutId),
-			MTP_long(data.veffect().value_or_empty()));
+			MTP_long(data.veffect().value_or_empty()),
+			(data.vfactcheck() ? *data.vfactcheck() : MTPFactCheck()));
 	});
 }
 
diff --git a/Telegram/SourceFiles/data/components/scheduled_messages.cpp b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
index c8505c47f8d9d..9e69dd35b75fc 100644
--- a/Telegram/SourceFiles/data/components/scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
@@ -92,7 +92,8 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			MTPVector<MTPRestrictionReason>(),
 			MTP_int(data.vttl_period().value_or_empty()),
 			MTPint(), // quick_reply_shortcut_id
-			MTP_long(data.veffect().value_or_empty())); // effect
+			MTP_long(data.veffect().value_or_empty()), // effect
+			data.vfactcheck() ? *data.vfactcheck() : MTPFactCheck());
 	});
 }
 
@@ -264,7 +265,8 @@ void ScheduledMessages::sendNowSimpleMessage(
 			MTPVector<MTPRestrictionReason>(),
 			MTP_int(update.vttl_period().value_or_empty()),
 			MTPint(), // quick_reply_shortcut_id
-			MTP_long(local->effectId())), // effect
+			MTP_long(local->effectId()), // effect
+			MTPFactCheck()),
 		localFlags,
 		NewMessageType::Unread);
 
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index f46fb1dc08d62..d101d5d883b0b 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -4572,7 +4572,8 @@ void Session::insertCheckedServiceNotification(
 				MTPVector<MTPRestrictionReason>(),
 				MTPint(), // ttl_period
 				MTPint(), // quick_reply_shortcut_id
-				MTPlong()), // effect
+				MTPlong(), // effect
+				MTPFactCheck()),
 			localFlags,
 			NewMessageType::Unread);
 	}
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
index 7270696cd1d0d..5e46d8d97b59b 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -140,7 +140,8 @@ MTPMessage PrepareLogMessage(const MTPMessage &message, TimeId newDate) {
 			MTPVector<MTPRestrictionReason>(),
 			MTPint(), // ttl_period
 			MTPint(), // quick_reply_shortcut_id
-			MTP_long(data.veffect().value_or_empty()));
+			MTP_long(data.veffect().value_or_empty()),
+			data.vfactcheck() ? *data.vfactcheck() : MTPFactCheck());
 	});
 }
 
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index c0d2472f9f3db..330e20ea7e3bd 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -38,7 +38,7 @@ inputMediaVenue#c13d1c11 geo_point:InputGeoPoint title:string address:string pro
 inputMediaPhotoExternal#e5bbfe1a flags:# spoiler:flags.1?true url:string ttl_seconds:flags.0?int = InputMedia;
 inputMediaDocumentExternal#fb52dc99 flags:# spoiler:flags.1?true url:string ttl_seconds:flags.0?int = InputMedia;
 inputMediaGame#d33f43f3 id:InputGame = InputMedia;
-inputMediaInvoice#8eb5a6d5 flags:# title:string description:string photo:flags.0?InputWebDocument invoice:Invoice payload:bytes provider:string provider_data:DataJSON start_param:flags.1?string extended_media:flags.2?InputMedia = InputMedia;
+inputMediaInvoice#405fef0d flags:# title:string description:string photo:flags.0?InputWebDocument invoice:Invoice payload:bytes provider:flags.3?string provider_data:DataJSON start_param:flags.1?string extended_media:flags.2?InputMedia = InputMedia;
 inputMediaGeoLive#971fa843 flags:# stopped:flags.0?true geo_point:InputGeoPoint heading:flags.2?int period:flags.1?int proximity_notification_radius:flags.3?int = InputMedia;
 inputMediaPoll#f94e5f1 flags:# poll:Poll correct_answers:flags.0?Vector<bytes> solution:flags.1?string solution_entities:flags.1?Vector<MessageEntity> = InputMedia;
 inputMediaDice#e66fbf7b emoticon:string = InputMedia;
@@ -114,7 +114,7 @@ chatPhotoEmpty#37c1011c = ChatPhoto;
 chatPhoto#1c6e1c11 flags:# has_video:flags.0?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = ChatPhoto;
 
 messageEmpty#90a6ca84 flags:# id:int peer_id:flags.0?Peer = Message;
-message#bde09c2e 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 = 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;
 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;
@@ -414,6 +414,7 @@ updateBotEditBusinessMessage#7df587c flags:# connection_id:string message:Messag
 updateBotDeleteBusinessMessage#a02a982e connection_id:string peer:Peer messages:Vector<int> qts:int = Update;
 updateNewStoryReaction#1824e40b story_id:int peer:Peer reaction:Reaction = Update;
 updateBroadcastRevenueTransactions#dfd961f5 peer:Peer balances:BroadcastRevenueBalances = Update;
+updateStarsBalance#fb85198 balance:long = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -901,6 +902,7 @@ inputWebFileAudioAlbumThumbLocation#f46fe924 flags:# small:flags.2?true document
 upload.webFile#21e753bc size:int mime_type:string file_type:storage.FileType mtime:int bytes:bytes = upload.WebFile;
 
 payments.paymentForm#a0058751 flags:# can_save_credentials:flags.2?true password_missing:flags.3?true form_id:long bot_id:long title:string description:string photo:flags.5?WebDocument invoice:Invoice provider_id:long url:string native_provider:flags.4?string native_params:flags.4?DataJSON additional_methods:flags.6?Vector<PaymentFormMethod> saved_info:flags.0?PaymentRequestedInfo saved_credentials:flags.1?Vector<PaymentSavedCredentials> users:Vector<User> = payments.PaymentForm;
+payments.paymentFormStars#7bf6b15c flags:# form_id:long bot_id:long title:string description:string photo:flags.5?WebDocument invoice:Invoice users:Vector<User> = payments.PaymentForm;
 
 payments.validatedRequestedInfo#d1451883 flags:# id:flags.0?string shipping_options:flags.1?Vector<ShippingOption> = payments.ValidatedRequestedInfo;
 
@@ -1447,6 +1449,7 @@ attachMenuPeerTypeBroadcast#7bfbdefc = AttachMenuPeerType;
 inputInvoiceMessage#c5b56859 peer:InputPeer msg_id:int = InputInvoice;
 inputInvoiceSlug#c326caef slug:string = InputInvoice;
 inputInvoicePremiumGiftCode#98986c0d purpose:InputStorePaymentPurpose option:PremiumGiftCodeOption = InputInvoice;
+inputInvoiceStars#1da33ad8 option:StarsTopupOption = InputInvoice;
 
 payments.exportedInvoice#aed0cbd9 url:string = payments.ExportedInvoice;
 
@@ -1458,6 +1461,7 @@ inputStorePaymentPremiumSubscription#a6751e66 flags:# restore:flags.0?true upgra
 inputStorePaymentGiftPremium#616f7fe8 user_id:InputUser currency:string amount:long = InputStorePaymentPurpose;
 inputStorePaymentPremiumGiftCode#a3805f3f flags:# users:Vector<InputUser> boost_peer:flags.0?InputPeer currency:string amount:long = InputStorePaymentPurpose;
 inputStorePaymentPremiumGiveaway#160544ca flags:# only_new_subscribers:flags.0?true winners_are_visible:flags.3?true boost_peer:InputPeer additional_peers:flags.1?Vector<InputPeer> countries_iso2:flags.2?Vector<string> prize_description:flags.4?string random_id:long until_date:int currency:string amount:long = InputStorePaymentPurpose;
+inputStorePaymentStars#4f0ee8df flags:# stars:long currency:string amount:long = InputStorePaymentPurpose;
 
 premiumGiftOption#74c34319 flags:# months:int currency:string amount:long bot_url:string store_product:flags.0?string = PremiumGiftOption;
 
@@ -1787,6 +1791,19 @@ availableEffect#93c3e27e flags:# premium_required:flags.2?true id:long emoticon:
 messages.availableEffectsNotModified#d1ed9a5b = messages.AvailableEffects;
 messages.availableEffects#bddb616e hash:int effects:Vector<AvailableEffect> documents:Vector<Document> = messages.AvailableEffects;
 
+factCheck#b89bfccf flags:# need_check:flags.0?true country:flags.1?string text:flags.1?TextWithEntities hash:long = FactCheck;
+
+starsTransactionPeerAppStore#b457b375 = StarsTransactionPeer;
+starsTransactionPeerPlayMarket#7b560a0b = StarsTransactionPeer;
+starsTransactionPeerFragment#e92fd902 = StarsTransactionPeer;
+starsTransactionPeer#d80da15d peer:Peer = StarsTransactionPeer;
+
+starsTopupOption#bd915c0 flags:# extended:flags.1?true stars:long store_product:flags.0?string currency:string amount:long = StarsTopupOption;
+
+starsTransaction#5f6b790c id:string stars:long date:int peer:StarsTransactionPeer = StarsTransaction;
+
+payments.starsStatus#8cf4ee60 flags:# balance:long history:Vector<StarsTransaction> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.StarsStatus;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2179,6 +2196,9 @@ messages.toggleDialogFilterTags#fd2dda49 enabled:Bool = Bool;
 messages.getMyStickers#d0b5e1fc offset_id:long limit:int = messages.MyStickers;
 messages.getEmojiStickerGroups#1dd840f5 hash:int = messages.EmojiGroups;
 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>;
 
 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;
@@ -2324,6 +2344,10 @@ payments.checkGiftCode#8e51b4c1 slug:string = payments.CheckedGiftCode;
 payments.applyGiftCode#f6e26854 slug:string = Updates;
 payments.getGiveawayInfo#f4239425 peer:InputPeer msg_id:int = payments.GiveawayInfo;
 payments.launchPrepaidGiveaway#5ff58f20 peer:InputPeer giveaway_id:long purpose:InputStorePaymentPurpose = Updates;
+payments.getStarsTopupOptions#c00ec7d3 = Vector<StarsTopupOption>;
+payments.getStarsStatus#104fcfa7 peer:InputPeer = payments.StarsStatus;
+payments.getStarsTransactions#673ac2f9 flags:# inbound:flags.0?true outbound:flags.1?true peer:InputPeer offset:string = payments.StarsStatus;
+payments.sendStarsForm#2bb731d flags:# form_id:long invoice:InputInvoice = payments.PaymentResult;
 
 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;
@@ -2442,4 +2466,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 180
+// LAYER 181
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index d39b1773730de..59c8e5d658456 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -359,8 +359,11 @@ void Form::requestForm() {
 		MTP_dataJSON(MTP_bytes(Window::Theme::WebViewParams().json))
 	)).done([=](const MTPpayments_PaymentForm &result) {
 		hideProgress();
-		result.match([&](const auto &data) {
+		result.match([&](const MTPDpayments_paymentForm &data) {
 			processForm(data);
+		}, [&](const MTPDpayments_paymentFormStars &data) {
+			// #TODO stars
+			_updates.fire(Error{ Error::Type::Form });
 		});
 	}).fail([=](const MTP::Error &error) {
 		hideProgress();
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 2bbe649f0bc05..6feb9c32af4f0 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -199,7 +199,8 @@ AdminLog::OwnedItem GenerateForwardedItem(
 		MTPVector<MTPRestrictionReason>(),
 		MTPint(), // ttl_period
 		MTPint(), // quick_reply_shortcut_id
-		MTPlong() // effect
+		MTPlong(), // effect
+		MTPFactCheck()
 	).match([&](const MTPDmessage &data) {
 		return history->makeMessage(
 			history->nextNonHistoryEntryId(),

From ac2f35f12bb6b49e1ca8bf8b24c678b13ee38163 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 17 May 2024 14:35:19 +0300
Subject: [PATCH 207/400] Processed payments form with API scheme on layer 181.

---
 .../SourceFiles/payments/payments_form.cpp    | 119 ++++++++++--------
 Telegram/SourceFiles/payments/payments_form.h |   4 +-
 2 files changed, 71 insertions(+), 52 deletions(-)

diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index 59c8e5d658456..16469cb1ed297 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -359,12 +359,7 @@ void Form::requestForm() {
 		MTP_dataJSON(MTP_bytes(Window::Theme::WebViewParams().json))
 	)).done([=](const MTPpayments_PaymentForm &result) {
 		hideProgress();
-		result.match([&](const MTPDpayments_paymentForm &data) {
-			processForm(data);
-		}, [&](const MTPDpayments_paymentFormStars &data) {
-			// #TODO stars
-			_updates.fire(Error{ Error::Type::Form });
-		});
+		processForm(result);
 	}).fail([=](const MTP::Error &error) {
 		hideProgress();
 		_updates.fire(Error{ Error::Type::Form, error.type() });
@@ -390,33 +385,44 @@ void Form::requestReceipt() {
 	}).send();
 }
 
-void Form::processForm(const MTPDpayments_paymentForm &data) {
-	_session->data().processUsers(data.vusers());
+void Form::processForm(const MTPpayments_PaymentForm &result) {
+	using TLForm = MTPDpayments_paymentForm;
+	using TLCredits = MTPDpayments_paymentFormStars;
+	result.match([&](const auto &data) {
+		_session->data().processUsers(data.vusers());
 
-	data.vinvoice().match([&](const auto &data) {
-		processInvoice(data);
-	});
-	processDetails(data);
-	if (const auto info = data.vsaved_info()) {
-		info->match([&](const auto &data) {
-			processSavedInformation(data);
+		data.vinvoice().match([&](const auto &data) {
+			processInvoice(data);
 		});
-	}
+	});
+
+	processDetails(result);
+	result.match([&](const TLForm &data) {
+		if (const auto info = data.vsaved_info()) {
+			info->match([&](const auto &data) {
+				processSavedInformation(data);
+			});
+		}
+	}, [](const TLCredits &) {
+	});
 	_paymentMethod.savedCredentials.clear();
 	_paymentMethod.savedCredentialsIndex = 0;
-	if (const auto credentials = data.vsaved_credentials()) {
-		_paymentMethod.savedCredentials.reserve(credentials->v.size());
-		for (const auto &saved : credentials->v) {
-			_paymentMethod.savedCredentials.push_back({
-				.id = qs(saved.data().vid()),
-				.title = qs(saved.data().vtitle()),
-			});
+	result.match([&](const TLForm &data) {
+		if (const auto credentials = data.vsaved_credentials()) {
+			_paymentMethod.savedCredentials.reserve(credentials->v.size());
+			for (const auto &saved : credentials->v) {
+				_paymentMethod.savedCredentials.push_back({
+					.id = qs(saved.data().vid()),
+					.title = qs(saved.data().vtitle()),
+				});
+			}
+			refreshPaymentMethodDetails();
 		}
-		refreshPaymentMethodDetails();
-	}
-	if (const auto additional = data.vadditional_methods()) {
-		processAdditionalPaymentMethods(additional->v);
-	}
+		if (const auto additional = data.vadditional_methods()) {
+			processAdditionalPaymentMethods(additional->v);
+		}
+	}, [](const TLCredits &) {
+	});
 	fillPaymentMethodInformation();
 	_updates.fire(FormReady{});
 }
@@ -479,31 +485,44 @@ void Form::processInvoice(const MTPDinvoice &data) {
 	};
 }
 
-void Form::processDetails(const MTPDpayments_paymentForm &data) {
-	const auto nativeParams = data.vnative_params();
-	auto nativeParamsJson = nativeParams
-		? nativeParams->match(
-			[&](const MTPDdataJSON &data) { return data.vdata().v; })
-		: QByteArray();
-	_details = FormDetails{
-		.formId = data.vform_id().v,
-		.url = qs(data.vurl()),
-		.nativeProvider = qs(data.vnative_provider().value_or_empty()),
-		.nativeParamsJson = std::move(nativeParamsJson),
-		.botId = data.vbot_id().v,
-		.providerId = data.vprovider_id().v,
-		.canSaveCredentials = data.is_can_save_credentials(),
-		.passwordMissing = data.is_password_missing(),
-	};
-	_invoice.cover.title = qs(data.vtitle());
+void Form::processDetails(const MTPpayments_PaymentForm &result) {
+	using TLForm = MTPDpayments_paymentForm;
+	using TLCredits = MTPDpayments_paymentFormStars;
+	_details = result.match([&](const TLForm &data) {
+		const auto nativeParams = data.vnative_params();
+		auto nativeParamsJson = nativeParams
+			? nativeParams->match(
+				[&](const MTPDdataJSON &data) { return data.vdata().v; })
+			: QByteArray();
+		return FormDetails{
+			.formId = data.vform_id().v,
+			.url = qs(data.vurl()),
+			.nativeProvider = qs(data.vnative_provider().value_or_empty()),
+			.nativeParamsJson = std::move(nativeParamsJson),
+			.botId = data.vbot_id().v,
+			.providerId = data.vprovider_id().v,
+			.canSaveCredentials = data.is_can_save_credentials(),
+			.passwordMissing = data.is_password_missing(),
+		};
+	}, [](const TLCredits &data) {
+		return FormDetails{
+			.formId = data.vform_id().v,
+			.botId = data.vbot_id().v,
+		};
+	});
+	_invoice.cover.title = result.match([](const auto &data) {
+		return qs(data.vtitle());
+	});
 	_invoice.cover.description = TextUtilities::ParseEntities(
-		qs(data.vdescription()),
+		result.match([](const auto &d) { return qs(d.vdescription()); }),
 		TextParseLinks | TextParseMultiline);
 	if (_invoice.cover.thumbnail.isNull() && !_thumbnailLoadProcess) {
-		if (const auto photo = data.vphoto()) {
-			loadThumbnail(
-				_session->data().photoFromWeb(*photo, ImageLocation()));
-		}
+		result.match([&](const auto &data) {
+			if (const auto photo = data.vphoto()) {
+				loadThumbnail(
+					_session->data().photoFromWeb(*photo, ImageLocation()));
+			}
+		});
 	}
 	if (const auto botId = _details.botId) {
 		if (const auto bot = _session->data().userLoaded(botId)) {
diff --git a/Telegram/SourceFiles/payments/payments_form.h b/Telegram/SourceFiles/payments/payments_form.h
index 414eb0b021637..68cb75cebe78f 100644
--- a/Telegram/SourceFiles/payments/payments_form.h
+++ b/Telegram/SourceFiles/payments/payments_form.h
@@ -285,10 +285,10 @@ class Form final : public base::has_weak_ptr {
 
 	void requestForm();
 	void requestReceipt();
-	void processForm(const MTPDpayments_paymentForm &data);
+	void processForm(const MTPpayments_PaymentForm &result);
 	void processReceipt(const MTPDpayments_paymentReceipt &data);
 	void processInvoice(const MTPDinvoice &data);
-	void processDetails(const MTPDpayments_paymentForm &data);
+	void processDetails(const MTPpayments_PaymentForm &result);
 	void processDetails(const MTPDpayments_paymentReceipt &data);
 	void processSavedInformation(const MTPDpaymentRequestedInfo &data);
 	void processAdditionalPaymentMethods(

From bc7aa91fbb9aea8aaa7a235dd28eb2a9d5acd3f5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 16 May 2024 16:49:59 +0300
Subject: [PATCH 208/400] Removed redundant constructor from
 Ui::Premium::TopBar.

---
 .../SourceFiles/boxes/gift_premium_box.cpp    | 38 ++++++++++---------
 .../boosts/create_giveaway_box.cpp            | 16 ++++----
 .../SourceFiles/settings/settings_premium.cpp |  8 ++--
 .../ui/effects/premium_top_bar.cpp            | 17 ---------
 .../SourceFiles/ui/effects/premium_top_bar.h  |  8 ----
 5 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 10ad9409d1cfb..339e7ee303d13 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -1147,16 +1147,18 @@ void GiftCodeBox(
 		object_ptr<Ui::Premium::TopBar>(
 			box,
 			st::giveawayGiftCodeCover,
-			nullptr,
-			rpl::conditional(
-				state->used.value(),
-				tr::lng_gift_link_used_title(),
-				tr::lng_gift_link_title()),
-			rpl::conditional(
-				state->used.value(),
-				tr::lng_gift_link_used_about(Ui::Text::RichLangValue),
-				tr::lng_gift_link_about(Ui::Text::RichLangValue)),
-			true));
+			Ui::Premium::TopBarDescriptor{
+				.clickContextOther = nullptr,
+				.title = rpl::conditional(
+					state->used.value(),
+					tr::lng_gift_link_used_title(),
+					tr::lng_gift_link_title()),
+				.about = rpl::conditional(
+					state->used.value(),
+					tr::lng_gift_link_used_about(Ui::Text::RichLangValue),
+					tr::lng_gift_link_about(Ui::Text::RichLangValue)),
+				.light = true,
+			}));
 
 	const auto max = st::giveawayGiftCodeTopHeight;
 	bar->setMaximumHeight(max);
@@ -1283,13 +1285,15 @@ void GiftCodePendingBox(
 			object_ptr<Ui::Premium::TopBar>(
 				box,
 				st,
-				clickContext,
-				tr::lng_gift_link_title(),
-				tr::lng_gift_link_pending_about(
-					lt_user,
-					rpl::single(Ui::Text::Link(resultToName)),
-					Ui::Text::RichLangValue),
-				true));
+				Ui::Premium::TopBarDescriptor{
+					.clickContextOther = clickContext,
+					.title = tr::lng_gift_link_title(),
+					.about = tr::lng_gift_link_pending_about(
+						lt_user,
+						rpl::single(Ui::Text::Link(resultToName)),
+						Ui::Text::RichLangValue),
+					.light = true,
+				}));
 
 		const auto max = st::giveawayGiftCodeTopHeight;
 		bar->setMaximumHeight(max);
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
index 4734718b96371..629d6949b554e 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
@@ -174,13 +174,15 @@ void AddPremiumTopBarWithDefaultTitleBar(
 	const auto bar = Ui::CreateChild<Ui::Premium::TopBar>(
 		box.get(),
 		st::startGiveawayCover,
-		nullptr,
-		tr::lng_giveaway_new_title(),
-		(group
-			? tr::lng_giveaway_new_about_group
-			: tr::lng_giveaway_new_about)(Ui::Text::RichLangValue),
-		true,
-		false);
+		Ui::Premium::TopBarDescriptor{
+			.clickContextOther = nullptr,
+			.title = tr::lng_giveaway_new_title(),
+			.about = (group
+				? tr::lng_giveaway_new_about_group
+				: tr::lng_giveaway_new_about)(Ui::Text::RichLangValue),
+			.light = true,
+			.optimizeMinistars = false,
+		});
 	bar->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	box->addRow(
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 057f36d2d9973..9a003d3d23a0c 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -1064,9 +1064,11 @@ QPointer<Ui::RpWidget> Premium::createPinnedToTop(
 		return Ui::CreateChild<Ui::Premium::TopBar>(
 			parent.get(),
 			st::defaultPremiumCover,
-			clickContextOther,
-			std::move(title),
-			std::move(about));
+			Ui::Premium::TopBarDescriptor{
+				.clickContextOther = clickContextOther,
+				.title = std::move(title),
+				.about = std::move(about),
+			});
 	}();
 	_setPaused = [=](bool paused) {
 		content->setPaused(paused);
diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
index 5ef11ba50e2d7..c5f12ad6f99d7 100644
--- a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
@@ -164,23 +164,6 @@ void TopBarAbstract::computeIsDark() {
 	_isDark = (contrast > kMinAcceptableContrast);
 }
 
-TopBar::TopBar(
-	not_null<QWidget*> parent,
-	const style::PremiumCover &st,
-	Fn<QVariant()> clickContextOther,
-	rpl::producer<QString> title,
-	rpl::producer<TextWithEntities> about,
-	bool light,
-	bool optimizeMinistars)
-: TopBar(parent, st, {
-	.clickContextOther = std::move(clickContextOther),
-	.title = std::move(title),
-	.about = std::move(about),
-	.light = light,
-	.optimizeMinistars = optimizeMinistars,
-}) {
-}
-
 TopBar::TopBar(
 	not_null<QWidget*> parent,
 	const style::PremiumCover &st,
diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.h b/Telegram/SourceFiles/ui/effects/premium_top_bar.h
index 4ac3cc8be6860..13e8a38c7c645 100644
--- a/Telegram/SourceFiles/ui/effects/premium_top_bar.h
+++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.h
@@ -75,14 +75,6 @@ struct TopBarDescriptor {
 
 class TopBar final : public TopBarAbstract {
 public:
-	TopBar(
-		not_null<QWidget*> parent,
-		const style::PremiumCover &st,
-		Fn<QVariant()> clickContextOther,
-		rpl::producer<QString> title,
-		rpl::producer<TextWithEntities> about,
-		bool light = false,
-		bool optimizeMinistars = true);
 	TopBar(
 		not_null<QWidget*> parent,
 		const style::PremiumCover &st,

From 2a224c839ef6629b251035a88e0759386cd33278 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 16 May 2024 16:31:25 +0300
Subject: [PATCH 209/400] Added initial phrases for settings section for
 credits.

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

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 47ad8c12d62d4..d138d5f913b51 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2298,6 +2298,28 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_business_about_sponsored_link" = "Telegram Ad Platform {emoji}";
 "lng_business_about_sponsored_url" = "https://ads.telegram.org";
 
+"lng_credits_summary_title" = "Telegram Stars";
+"lng_credits_summary_about" = "Buy Stars to unlock content and services in miniapps on Telegram.";
+"lng_credits_summary_options_subtitle" = "Choose package";
+"lng_credits_summary_options_credits#one" = "{count} Star";
+"lng_credits_summary_options_credits#other" = "{count} Stars";
+"lng_credits_summary_options_more" = "More Options";
+"lng_credits_summary_options_about" = "By proceeding and purchasing Stars, you agree with the {link}.";
+"lng_credits_summary_options_about_link" = "Terms and Conditions";
+"lng_credits_summary_history_tab_full" = "All Transactions";
+"lng_credits_summary_history_tab_in" = "Incoming";
+"lng_credits_summary_history_tab_out" = "Outgoing";
+"lng_credits_summary_history_entry_inner_in" = "In-App Purchase";
+"lng_credits_summary_balance" = "Balance";
+"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**?";
+"lng_credits_box_out_sure#other" = "Do you want to buy **\"{text}\"** in **{bot}** for **{count} Stars**?";
+"lng_credits_box_out_confirm#one" = "Confirm and Pay {emoji} {count} Star";
+"lng_credits_box_out_confirm#other" = "Confirm and Pay {emoji} {count} Stars";
+"lng_credits_summary_in_toast_title" = "Stars Acquired";
+"lng_credits_summary_in_toast_about#one" = "**{count}** Star added to your balance.";
+"lng_credits_summary_in_toast_about#other" = "**{count}** Stars added to your balance.";
+
 "lng_location_title" = "Location";
 "lng_location_about" = "Display the location of your business on your account.";
 "lng_location_address" = "Enter Address";

From 53d97b4146dc0031cd2f67eabc28feb561ce01e0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 16 May 2024 21:28:13 +0300
Subject: [PATCH 210/400] Added ability to provide custom gradient to colored
 premium stars.

---
 .../ui/effects/premium_stars_colored.cpp            | 13 ++++++++-----
 .../SourceFiles/ui/effects/premium_stars_colored.h  |  4 ++--
 Telegram/SourceFiles/ui/effects/premium_top_bar.cpp |  6 ++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp b/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
index 18c9c9c24f9a8..d5987a5e7ad8a 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
@@ -35,11 +35,14 @@ void ColoredMiniStars::setSize(const QSize &size) {
 	_mask.fill(Qt::transparent);
 	{
 		auto p = QPainter(&_mask);
-		if (_colorOverride) {
-			p.fillRect(0, 0, size.width(), size.height(), *_colorOverride);
+		if (_stopsOverride && _stopsOverride->size() == 1) {
+			const auto &color = _stopsOverride->front().second;
+			p.fillRect(0, 0, size.width(), size.height(), color);
 		} else {
 			auto gradient = QLinearGradient(0, 0, size.width(), 0);
-			gradient.setStops(Ui::Premium::GiftGradientStops());
+			gradient.setStops((_stopsOverride && _stopsOverride->size() > 1)
+				? (*_stopsOverride)
+				: Ui::Premium::GiftGradientStops());
 			p.setPen(Qt::NoPen);
 			p.setBrush(gradient);
 			p.drawRect(0, 0, size.width(), size.height());
@@ -63,8 +66,8 @@ void ColoredMiniStars::setPosition(QPoint position) {
 	_position = std::move(position);
 }
 
-void ColoredMiniStars::setColorOverride(std::optional<QColor> color) {
-	_colorOverride = color;
+void ColoredMiniStars::setColorOverride(std::optional<QGradientStops> stops) {
+	_stopsOverride = stops;
 }
 
 void ColoredMiniStars::paint(QPainter &p) {
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars_colored.h b/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
index 75660ab992711..73001ada0b554 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
+++ b/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
@@ -21,7 +21,7 @@ class ColoredMiniStars final {
 
 	void setSize(const QSize &size);
 	void setPosition(QPoint position);
-	void setColorOverride(std::optional<QColor> color);
+	void setColorOverride(std::optional<QGradientStops> stops);
 	void setCenter(const QRect &rect);
 	void paint(QPainter &p);
 
@@ -34,7 +34,7 @@ class ColoredMiniStars final {
 	QImage _mask;
 	QSize _size;
 	QPoint _position;
-	std::optional<QColor> _colorOverride;
+	std::optional<QGradientStops> _stopsOverride;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
index c5f12ad6f99d7..aaba431ca9e83 100644
--- a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
@@ -202,10 +202,12 @@ TopBar::TopBar(
 
 		if (_logo == u"dollar"_q) {
 			_dollar = ScaleTo(QImage(u":/gui/art/business_logo.png"_q));
-			_ministars.setColorOverride(st::premiumButtonFg->c);
+			_ministars.setColorOverride(
+				QGradientStops{{ 0, st::premiumButtonFg->c }});
 		} else if (!_light && !TopBarAbstract::isDark()) {
 			_star.load(Svg());
-			_ministars.setColorOverride(st::premiumButtonFg->c);
+			_ministars.setColorOverride(
+				QGradientStops{{ 0, st::premiumButtonFg->c }});
 		} else {
 			_star.load(ColorizedSvg());
 			_ministars.setColorOverride(std::nullopt);

From 4a0bffe61832a4731454f9fdbf24e6550964f6d8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 16 May 2024 21:34:07 +0300
Subject: [PATCH 211/400] Added ability to provide custom gradient to star in
 premium top bar.

---
 .../settings/settings_privacy_security.cpp           |  4 +++-
 Telegram/SourceFiles/ui/effects/premium_top_bar.cpp  | 12 +++++++-----
 Telegram/SourceFiles/ui/effects/premium_top_bar.h    |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 66a26632b4b7b..ab8f322174d82 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -30,6 +30,7 @@ For license and copyright information please follow this link:
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "ui/chat/chat_style.h"
+#include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
@@ -79,7 +80,8 @@ using Privacy = Api::UserPrivacy;
 	image.fill(Qt::transparent);
 	{
 		auto p = QPainter(&image);
-		auto star = QSvgRenderer(Ui::Premium::ColorizedSvg());
+		auto star = QSvgRenderer(
+			Ui::Premium::ColorizedSvg(Ui::Premium::ButtonGradientStops()));
 		star.render(&p, Rect(size));
 	}
 	return image;
diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
index aaba431ca9e83..fd3d119509b5f 100644
--- a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
@@ -46,15 +46,15 @@ QString Svg() {
 	return u":/gui/icons/settings/star.svg"_q;
 }
 
-QByteArray ColorizedSvg() {
+QByteArray ColorizedSvg(const QGradientStops &gradientStops) {
 	auto f = QFile(Svg());
 	if (!f.open(QIODevice::ReadOnly)) {
 		return QByteArray();
 	}
 	auto content = QString::fromUtf8(f.readAll());
-	auto stops = [] {
+	auto stops = [&] {
 		auto s = QString();
-		for (const auto &stop : Ui::Premium::ButtonGradientStops()) {
+		for (const auto &stop : gradientStops) {
 			s += QString("<stop offset='%1' stop-color='%2'/>")
 				.arg(QString::number(stop.first), stop.second.name());
 		}
@@ -209,8 +209,10 @@ TopBar::TopBar(
 			_ministars.setColorOverride(
 				QGradientStops{{ 0, st::premiumButtonFg->c }});
 		} else {
-			_star.load(ColorizedSvg());
-			_ministars.setColorOverride(std::nullopt);
+			_star.load(ColorizedSvg(descriptor.gradientStops
+				? (*descriptor.gradientStops)
+				: Ui::Premium::ButtonGradientStops()));
+			_ministars.setColorOverride(descriptor.gradientStops);
 		}
 		auto event = QResizeEvent(size(), size());
 		resizeEvent(&event);
diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.h b/Telegram/SourceFiles/ui/effects/premium_top_bar.h
index 13e8a38c7c645..86c8158fffad9 100644
--- a/Telegram/SourceFiles/ui/effects/premium_top_bar.h
+++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.h
@@ -26,7 +26,7 @@ class FlatLabel;
 namespace Ui::Premium {
 
 [[nodiscard]] QString Svg();
-[[nodiscard]] QByteArray ColorizedSvg();
+[[nodiscard]] QByteArray ColorizedSvg(const QGradientStops &gradientStops);
 [[nodiscard]] QImage GenerateStarForLightTopBar(QRectF rect);
 
 class TopBarAbstract : public RpWidget {
@@ -71,6 +71,7 @@ struct TopBarDescriptor {
 	rpl::producer<TextWithEntities> about;
 	bool light = false;
 	bool optimizeMinistars = true;
+	std::optional<QGradientStops> gradientStops;
 };
 
 class TopBar final : public TopBarAbstract {

From b5eb195f43b4b5c7812689d257fed3ce4c2904a7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 16 May 2024 21:44:42 +0300
Subject: [PATCH 212/400] Added initial dummy settings section for credits.

---
 .../SourceFiles/settings/settings_credits.cpp | 231 ++++++++++++++++++
 .../SourceFiles/settings/settings_credits.h   |  44 ++++
 .../SourceFiles/settings/settings_main.cpp    |  20 +-
 Telegram/SourceFiles/ui/effects/premium.style |   6 +
 .../ui/effects/premium_graphics.cpp           |   7 +
 .../SourceFiles/ui/effects/premium_graphics.h |   1 +
 6 files changed, 304 insertions(+), 5 deletions(-)
 create mode 100644 Telegram/SourceFiles/settings/settings_credits.cpp
 create mode 100644 Telegram/SourceFiles/settings/settings_credits.h

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
new file mode 100644
index 0000000000000..4656170f6405e
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -0,0 +1,231 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/settings_credits.h"
+
+#include "api/api_credits.h"
+#include "core/click_handler_types.h"
+#include "data/data_user.h"
+#include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/settings_common_session.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/effects/premium_top_bar.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_session_controller.h"
+#include "styles/style_info.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+
+namespace Settings {
+namespace {
+
+using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
+
+class Credits : public Section<Credits> {
+public:
+	Credits(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
+		not_null<QWidget*> parent) override;
+
+	void showFinished() override;
+
+	[[nodiscard]] bool hasFlexibleTopBar() const override;
+
+	void setStepDataReference(std::any &data) override;
+
+	[[nodiscard]] rpl::producer<> sectionShowBack() override final;
+
+private:
+	void setupContent();
+	void setupOptions(not_null<Ui::VerticalLayout*> container);
+
+	const not_null<Window::SessionController*> _controller;
+
+	base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
+	base::unique_qptr<Ui::IconButton> _close;
+	rpl::variable<bool> _backToggles;
+	rpl::variable<Info::Wrap> _wrap;
+	Fn<void(bool)> _setPaused;
+
+	rpl::event_stream<> _showBack;
+	rpl::event_stream<> _showFinished;
+	rpl::variable<QString> _buttonText;
+
+};
+
+Credits::Credits(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent)
+, _controller(controller) {
+	setupContent();
+}
+
+rpl::producer<QString> Credits::title() {
+	return tr::lng_premium_summary_title();
+}
+
+bool Credits::hasFlexibleTopBar() const {
+	return true;
+}
+
+rpl::producer<> Credits::sectionShowBack() {
+	return _showBack.events();
+}
+
+void Credits::setStepDataReference(std::any &data) {
+	const auto my = std::any_cast<SectionCustomTopBarData>(&data);
+	if (my) {
+		_backToggles = std::move(
+			my->backButtonEnables
+		) | rpl::map_to(true);
+		_wrap = std::move(my->wrapValue);
+	}
+}
+
+void Credits::setupOptions(not_null<Ui::VerticalLayout*> container) {
+}
+
+void Credits::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	Ui::ResizeFitChild(this, content);
+}
+
+QPointer<Ui::RpWidget> Credits::createPinnedToTop(
+		not_null<QWidget*> parent) {
+
+	const auto content = [&]() -> Ui::Premium::TopBarAbstract* {
+		const auto weak = base::make_weak(_controller);
+		const auto clickContextOther = [=] {
+			return QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = weak,
+				.botStartAutoSubmit = true,
+			});
+		};
+		return Ui::CreateChild<Ui::Premium::TopBar>(
+			parent.get(),
+			st::creditsPremiumCover,
+			Ui::Premium::TopBarDescriptor{
+				.clickContextOther = clickContextOther,
+				.title = tr::lng_credits_summary_title(),
+				.about = tr::lng_credits_summary_about(
+					TextWithEntities::Simple),
+				.light = true,
+				.gradientStops = Ui::Premium::CreditsIconGradientStops(),
+			});
+	}();
+	_setPaused = [=](bool paused) {
+		content->setPaused(paused);
+	};
+
+	_wrap.value(
+	) | rpl::start_with_next([=](Info::Wrap wrap) {
+		content->setRoundEdges(wrap == Info::Wrap::Layer);
+	}, content->lifetime());
+
+	content->setMaximumHeight(st::settingsPremiumTopHeight);
+	content->setMinimumHeight(st::infoLayerTopBarHeight);
+
+	content->resize(content->width(), content->maximumHeight());
+	content->additionalHeight(
+	) | rpl::start_with_next([=](int additionalHeight) {
+		const auto wasMax = (content->height() == content->maximumHeight());
+		content->setMaximumHeight(st::settingsPremiumTopHeight
+			+ additionalHeight);
+		if (wasMax) {
+			content->resize(content->width(), content->maximumHeight());
+		}
+	}, content->lifetime());
+
+	_wrap.value(
+	) | rpl::start_with_next([=](Info::Wrap wrap) {
+		const auto isLayer = (wrap == Info::Wrap::Layer);
+		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
+			content,
+			object_ptr<Ui::IconButton>(
+				content,
+				(isLayer ? st::infoTopBarBack : st::infoLayerTopBarBack)),
+			st::infoTopBarScale);
+		_back->setDuration(0);
+		_back->toggleOn(isLayer
+			? _backToggles.value() | rpl::type_erased()
+			: rpl::single(true));
+		_back->entity()->addClickHandler([=] {
+			_showBack.fire({});
+		});
+		_back->toggledValue(
+		) | rpl::start_with_next([=](bool toggled) {
+			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
+			content->setTextPosition(
+				toggled ? st.back.width : st.titlePosition.x(),
+				st.titlePosition.y());
+		}, _back->lifetime());
+
+		if (!isLayer) {
+			_close = nullptr;
+		} else {
+			_close = base::make_unique_q<Ui::IconButton>(
+				content,
+				st::infoTopBarClose);
+			_close->addClickHandler([=] {
+				_controller->parentController()->hideLayer();
+				_controller->parentController()->hideSpecialLayer();
+			});
+			content->widthValue(
+			) | rpl::start_with_next([=] {
+				_close->moveToRight(0, 0);
+			}, _close->lifetime());
+		}
+	}, content->lifetime());
+
+	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+}
+
+void Credits::showFinished() {
+	_showFinished.fire({});
+}
+
+} // namespace
+
+template <>
+struct SectionFactory<Credits> : AbstractSectionFactory {
+	object_ptr<AbstractSection> create(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::ScrollArea*> scroll,
+		rpl::producer<Container> containerValue
+	) const final override {
+		return object_ptr<Credits>(parent, controller);
+	}
+	bool hasCustomTopBar() const final override {
+		return true;
+	}
+
+	[[nodiscard]] static const std::shared_ptr<SectionFactory> &Instance() {
+		static const auto result = std::make_shared<SectionFactory>();
+		return result;
+	}
+};
+
+Type CreditsId() {
+	return Credits::Id();
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_credits.h b/Telegram/SourceFiles/settings/settings_credits.h
new file mode 100644
index 0000000000000..7484fa6373e7d
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_credits.h
@@ -0,0 +1,44 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_type.h"
+
+enum class PremiumFeature;
+
+namespace style {
+struct RoundButton;
+} // namespace style
+
+namespace ChatHelpers {
+class Show;
+enum class WindowUsage;
+} // namespace ChatHelpers
+
+namespace Ui {
+class RpWidget;
+class RoundButton;
+class GradientButton;
+class VerticalLayout;
+} // namespace Ui
+
+namespace Main {
+class Session;
+class SessionShow;
+} // namespace Main
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Settings {
+
+[[nodiscard]] Type CreditsId();
+
+} // namespace Settings
+
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 551d4f33c0376..19a63e84f14d9 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -9,17 +9,18 @@ For license and copyright information please follow this link:
 
 #include "core/application.h"
 #include "core/click_handler_types.h"
+#include "settings/settings_advanced.h"
 #include "settings/settings_business.h"
-#include "settings/settings_codes.h"
+#include "settings/settings_calls.h"
 #include "settings/settings_chat.h"
+#include "settings/settings_codes.h"
+#include "settings/settings_credits.h"
+#include "settings/settings_folders.h"
 #include "settings/settings_information.h"
 #include "settings/settings_notifications.h"
-#include "settings/settings_privacy_security.h"
-#include "settings/settings_advanced.h"
-#include "settings/settings_folders.h"
-#include "settings/settings_calls.h"
 #include "settings/settings_power_saving.h"
 #include "settings/settings_premium.h"
+#include "settings/settings_privacy_security.h"
 #include "settings/settings_scale_preview.h"
 #include "boxes/language_box.h"
 #include "boxes/username_box.h"
@@ -414,6 +415,15 @@ void SetupPremium(
 		controller->setPremiumRef("settings");
 		showOther(PremiumId());
 	});
+	AddButtonWithIcon(
+		container,
+		tr::lng_credits_summary_title(),
+		st::settingsButton,
+		{ .icon = &st::menuIconPremium }
+	)->addClickHandler([=] {
+		controller->setPremiumRef("settings");
+		showOther(CreditsId());
+	});
 	const auto button = AddButtonWithIcon(
 		container,
 		tr::lng_business_title(),
diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style
index afdac71466323..0fffd9c5ebe43 100644
--- a/Telegram/SourceFiles/ui/effects/premium.style
+++ b/Telegram/SourceFiles/ui/effects/premium.style
@@ -364,3 +364,9 @@ boostFeatureLink: icon{{ "settings/premium/features/feature_links", windowBgActi
 boostFeatureName: icon{{ "settings/premium/features/feature_color_names", windowBgActive }};
 boostFeatureStories: icon{{ "settings/premium/features/feature_stories", windowBgActive }};
 boostFeatureTranscribe: icon{{ "settings/premium/features/feature_voice", windowBgActive }};
+
+creditsPremiumCover: PremiumCover(defaultPremiumCover) {
+	about: FlatLabel(userPremiumCoverAbout) {
+		textFg: boxTitleFg;
+	}
+}
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index b701f8500034b..d04dae62b642a 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -1177,6 +1177,13 @@ QGradientStops StoriesIconsGradientStops() {
 	};
 }
 
+QGradientStops CreditsIconGradientStops() {
+	return {
+		{ 0., st::creditsBg1->c },
+		{ 1., st::creditsBg2->c },
+	};
+}
+
 void ShowListBox(
 		not_null<Ui::GenericBox*> box,
 		const style::PremiumLimits &st,
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.h b/Telegram/SourceFiles/ui/effects/premium_graphics.h
index 728dd9d40dce6..339d49a3d30c8 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.h
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.h
@@ -124,6 +124,7 @@ void AddAccountsRow(
 [[nodiscard]] QGradientStops LockGradientStops();
 [[nodiscard]] QGradientStops FullHeightGradientStops();
 [[nodiscard]] QGradientStops GiftGradientStops();
+[[nodiscard]] QGradientStops CreditsIconGradientStops();
 
 struct ListEntry final {
 	rpl::producer<QString> title;

From f1636de572e23b45768f46ee3aa7645f30ece5c8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 16 May 2024 19:22:55 +0300
Subject: [PATCH 213/400] Added initial api support for credits topup options.

---
 Telegram/CMakeLists.txt                  |  4 ++
 Telegram/SourceFiles/api/api_credits.cpp | 52 ++++++++++++++++++++++++
 Telegram/SourceFiles/api/api_credits.h   | 35 ++++++++++++++++
 Telegram/SourceFiles/data/data_credits.h | 21 ++++++++++
 Telegram/cmake/td_ui.cmake               |  1 +
 5 files changed, 113 insertions(+)
 create mode 100644 Telegram/SourceFiles/api/api_credits.cpp
 create mode 100644 Telegram/SourceFiles/api/api_credits.h
 create mode 100644 Telegram/SourceFiles/data/data_credits.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 21e22150dff28..b1b39f59f96d3 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -120,6 +120,8 @@ PRIVATE
     api/api_common.h
     api/api_confirm_phone.cpp
     api/api_confirm_phone.h
+    api/api_credits.cpp
+    api/api_credits.h
     api/api_earn.cpp
     api/api_earn.h
     api/api_editing.cpp
@@ -1360,6 +1362,8 @@ PRIVATE
     settings/settings_codes.h
     settings/settings_common_session.cpp
     settings/settings_common_session.h
+    settings/settings_credits.cpp
+    settings/settings_credits.h
     settings/settings_experimental.cpp
     settings/settings_experimental.h
     settings/settings_folders.cpp
diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
new file mode 100644
index 0000000000000..96b03a8e8329c
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -0,0 +1,52 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_credits.h"
+
+#include "apiwrap.h"
+#include "data/data_peer.h"
+#include "main/main_session.h"
+
+namespace Api {
+
+CreditsTopupOptions::CreditsTopupOptions(not_null<PeerData*> peer)
+: _peer(peer)
+, _api(&peer->session().api().instance()) {
+}
+
+rpl::producer<rpl::no_value, QString> CreditsTopupOptions::request() {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		using TLOption = MTPStarsTopupOption;
+		_api.request(MTPpayments_GetStarsTopupOptions(
+		)).done([=](const MTPVector<TLOption> &result) {
+			_options = ranges::views::all(
+				result.v
+			) | ranges::views::transform([](const TLOption &option) {
+				return Data::CreditTopupOption{
+					.credits = option.data().vstars().v,
+					.product = qs(
+						option.data().vstore_product().value_or_empty()),
+					.currency = qs(option.data().vcurrency()),
+					.amount = option.data().vamount().v,
+				};
+			}) | ranges::to_vector;
+			consumer.put_done();
+		}).fail([=](const MTP::Error &error) {
+			consumer.put_error_copy(error.type());
+		}).send();
+
+		return lifetime;
+	};
+}
+
+Data::CreditTopupOptions CreditsTopupOptions::options() const {
+	return _options;
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_credits.h b/Telegram/SourceFiles/api/api_credits.h
new file mode 100644
index 0000000000000..61a568b621488
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_credits.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 "data/data_credits.h"
+#include "mtproto/sender.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Api {
+
+class CreditsTopupOptions final {
+public:
+	CreditsTopupOptions(not_null<PeerData*> peer);
+
+	[[nodiscard]] rpl::producer<rpl::no_value, QString> request();
+	[[nodiscard]] Data::CreditTopupOptions options() const;
+
+private:
+	const not_null<PeerData*> _peer;
+
+	Data::CreditTopupOptions _options;
+
+	MTP::Sender _api;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
new file mode 100644
index 0000000000000..db2ffec154d1d
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_credits.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 Data {
+
+struct CreditTopupOption final {
+	uint64 credits = 0;
+	QString product;
+	QString currency;
+	uint64 amount = 0;
+};
+
+using CreditTopupOptions = std::vector<CreditTopupOption>;
+
+} // namespace Data
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index adf5b8f11ec7b..987cca7219d6c 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -80,6 +80,7 @@ PRIVATE
     data/data_birthday.cpp
     data/data_birthday.h
     data/data_channel_earn.h
+    data/data_credits.h
     data/data_statistics_chart.cpp
     data/data_statistics_chart.h
     data/data_subscription_option.h

From d0bfee69635e68ec9333e4f86b0c58c61dd47eb4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 17 May 2024 00:04:44 +0300
Subject: [PATCH 214/400] Added initial list for topup options in settings
 section for credits.

---
 .../SourceFiles/settings/settings_credits.cpp | 113 +++++++++++++++++-
 Telegram/SourceFiles/ui/effects/credits.style |  24 ++++
 Telegram/SourceFiles/ui/effects/premium.style |   6 -
 Telegram/cmake/td_ui.cmake                    |   1 +
 4 files changed, 136 insertions(+), 8 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/effects/credits.style

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 4656170f6405e..10ac6e011d536 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -16,22 +16,56 @@ For license and copyright information please follow this link:
 #include "settings/settings_common_session.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h"
+#include "ui/image/image_prepare.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "window/window_session_controller.h"
+#include "styles/style_credits.h"
 #include "styles/style_info.h"
-#include "styles/style_premium.h"
+#include "styles/style_layers.h"
 #include "styles/style_settings.h"
 
+#include <QtSvg/QSvgRenderer>
+
 namespace Settings {
 namespace {
 
 using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
 
+[[nodiscard]] QImage GenerateStarForLightTopBar(QRectF rect) {
+	const auto strokeWidth = 3;
+
+	auto colorized = qs(Ui::Premium::ColorizedSvg(
+		Ui::Premium::CreditsIconGradientStops()));
+	colorized.replace(
+		"stroke=\"none\"",
+		"stroke=\"" + st::creditsStroke->c.name() + "\"");
+	colorized.replace("stroke-width=\"1\"", "stroke-width=\"3\"");
+	auto svg = QSvgRenderer(colorized.toUtf8());
+	svg.setViewBox(svg.viewBox() + Margins(strokeWidth));
+
+	const auto size = Size(st::settingsButton.height);
+	auto frame = QImage(
+		size * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	frame.setDevicePixelRatio(style::DevicePixelRatio());
+
+	frame.fill(Qt::transparent);
+	{
+		auto q = QPainter(&frame);
+		svg.render(&q, Rect(size));
+	}
+	return frame;
+}
+
 class Credits : public Section<Credits> {
 public:
 	Credits(
@@ -57,6 +91,8 @@ class Credits : public Section<Credits> {
 
 	const not_null<Window::SessionController*> _controller;
 
+	QImage _star;
+
 	base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
 	base::unique_qptr<Ui::IconButton> _close;
 	rpl::variable<bool> _backToggles;
@@ -73,7 +109,8 @@ Credits::Credits(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
 : Section(parent)
-, _controller(controller) {
+, _controller(controller)
+, _star(GenerateStarForLightTopBar({})) {
 	setupContent();
 }
 
@@ -100,10 +137,82 @@ void Credits::setStepDataReference(std::any &data) {
 }
 
 void Credits::setupOptions(not_null<Ui::VerticalLayout*> container) {
+	const auto options = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto content = options->entity();
+
+	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
+
+	const auto fill = [=](Data::CreditTopupOptions options) {
+		while (content->count()) {
+			delete content->widgetAt(0);
+		}
+		Ui::AddSubsectionTitle(
+			content,
+			tr::lng_credits_summary_options_subtitle());
+		for (const auto &option : options) {
+			const auto button = content->add(object_ptr<Ui::SettingsButton>(
+				content,
+				tr::lng_credits_summary_options_credits(
+					lt_count_decimal,
+					rpl::single(option.credits) | tr::to_count()),
+				st::creditsTopupButton));
+			const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
+			icon->resize(Size(button->st().height));
+			icon->paintRequest(
+			) | rpl::start_with_next([=](const QRect &rect) {
+				auto p = QPainter(icon);
+				p.drawImage(0, 0, _star);
+			}, icon->lifetime());
+			const auto price = Ui::CreateChild<Ui::FlatLabel>(
+				button,
+				Ui::FillAmountAndCurrency(option.amount, option.currency),
+				st::creditsTopupPrice);
+			button->sizeValue(
+			) | rpl::start_with_next([=](const QSize &size) {
+				const auto &st = button->st();
+				price->moveToRight(st.padding.right(), st.padding.top());
+				icon->moveToLeft(st.iconLeft, st.padding.top());
+			}, button->lifetime());
+			button->setClickedCallback([=] {
+			});
+			Ui::ToggleChildrenVisibility(button, true);
+		}
+
+		// Footer.
+		{
+			auto text = tr::lng_credits_summary_options_about(
+				lt_link,
+				tr::lng_credits_summary_options_about_link(
+				) | rpl::map([](const QString &t) {
+					using namespace Ui::Text;
+					return Link(t, u"https://telegram.org/tos"_q);
+				}),
+				Ui::Text::RichLangValue);
+			Ui::AddSkip(content);
+			Ui::AddDividerText(content, std::move(text));
+		}
+
+		content->resizeToWidth(container->width());
+	};
+
+	using ApiOptions = Api::CreditsTopupOptions;
+	const auto apiCredits = content->lifetime().make_state<ApiOptions>(
+		_controller->session().user());
+
+	apiCredits->request(
+	) | rpl::start_with_error_done([=](const QString &error) {
+		_controller->showToast(error);
+	}, [=] {
+		fill(apiCredits->options());
+	}, content->lifetime());
 }
 
 void Credits::setupContent() {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	setupOptions(content);
 
 	Ui::ResizeFitChild(this, content);
 }
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
new file mode 100644
index 0000000000000..4c27ea541e2ac
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -0,0 +1,24 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+using "ui/basic.style";
+using "boxes/boxes.style";
+using "ui/widgets/widgets.style";
+using "ui/effects/premium.style";
+using "settings/settings.style";
+
+creditsPremiumCover: PremiumCover(defaultPremiumCover) {
+	about: FlatLabel(userPremiumCoverAbout) {
+		textFg: boxTitleFg;
+	}
+}
+creditsTopupButton: SettingsButton(settingsButton) {
+	style: semiboldTextStyle;
+}
+creditsTopupPrice: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+}
diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style
index 0fffd9c5ebe43..afdac71466323 100644
--- a/Telegram/SourceFiles/ui/effects/premium.style
+++ b/Telegram/SourceFiles/ui/effects/premium.style
@@ -364,9 +364,3 @@ boostFeatureLink: icon{{ "settings/premium/features/feature_links", windowBgActi
 boostFeatureName: icon{{ "settings/premium/features/feature_color_names", windowBgActive }};
 boostFeatureStories: icon{{ "settings/premium/features/feature_stories", windowBgActive }};
 boostFeatureTranscribe: icon{{ "settings/premium/features/feature_voice", windowBgActive }};
-
-creditsPremiumCover: PremiumCover(defaultPremiumCover) {
-	about: FlatLabel(userPremiumCoverAbout) {
-		textFg: boxTitleFg;
-	}
-}
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 987cca7219d6c..8c8cddac41833 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -16,6 +16,7 @@ set(style_files
     ui/filter_icons.style
     ui/menu_icons.style
     ui/chat/chat.style
+    ui/effects/credits.style
     ui/effects/premium.style
     boxes/boxes.style
     dialogs/dialogs.style

From 9b11b95c5b64d88e97f8a53b32c0b4b326b8afee Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 17 May 2024 03:37:56 +0300
Subject: [PATCH 215/400] Added api support of invoice payments for credits.

---
 .../payments/payments_checkout_process.cpp    | 22 ++++++++++++
 .../payments/payments_checkout_process.h      |  4 +++
 .../SourceFiles/payments/payments_form.cpp    | 11 ++++++
 Telegram/SourceFiles/payments/payments_form.h | 15 +++++++-
 .../SourceFiles/settings/settings_credits.cpp | 35 +++++++++++++++++++
 5 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index e9fb12d269059..108376084d9d7 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -139,6 +139,28 @@ void CheckoutProcess::Start(
 	j->second->requestActivate();
 }
 
+void CheckoutProcess::Start(
+		InvoiceCredits creditsInvoice,
+		Fn<void(CheckoutResult)> reactivate) {
+	const auto randomId = creditsInvoice.randomId;
+	auto id = InvoiceId{ std::move(creditsInvoice) };
+	auto &processes = LookupSessionProcesses(SessionFromId(id));
+	const auto i = processes.byRandomId.find(randomId);
+	if (i != end(processes.byRandomId)) {
+		i->second->setReactivateCallback(std::move(reactivate));
+		i->second->requestActivate();
+		return;
+	}
+	const auto j = processes.byRandomId.emplace(
+		randomId,
+		std::make_unique<CheckoutProcess>(
+			std::move(id),
+			Mode::Payment,
+			std::move(reactivate),
+			PrivateTag{})).first;
+	j->second->requestActivate();
+}
+
 std::optional<PaidInvoice> CheckoutProcess::InvoicePaid(
 		not_null<const HistoryItem*> item) {
 	const auto session = &item->history()->session();
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.h b/Telegram/SourceFiles/payments/payments_checkout_process.h
index dd995324ffec9..9a87039272287 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.h
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.h
@@ -37,6 +37,7 @@ namespace Payments {
 class Form;
 struct FormUpdate;
 struct Error;
+struct InvoiceCredits;
 struct InvoiceId;
 struct InvoicePremiumGiftCode;
 
@@ -73,6 +74,9 @@ class CheckoutProcess final
 	static void Start(
 		InvoicePremiumGiftCode giftCodeInvoice,
 		Fn<void(CheckoutResult)> reactivate);
+	static void Start(
+		InvoiceCredits creditsInvoice,
+		Fn<void(CheckoutResult)> reactivate);
 	[[nodiscard]] static std::optional<PaidInvoice> InvoicePaid(
 		not_null<const HistoryItem*> item);
 	[[nodiscard]] static std::optional<PaidInvoice> InvoicePaid(
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index 16469cb1ed297..c02ea408b7188 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -117,6 +117,8 @@ not_null<Main::Session*> SessionFromId(const InvoiceId &id) {
 		return &message->peer->session();
 	} else if (const auto slug = std::get_if<InvoiceSlug>(&id.value)) {
 		return slug->session;
+	} else if (const auto slug = std::get_if<InvoiceCredits>(&id.value)) {
+		return slug->session;
 	}
 	const auto &giftCode = v::get<InvoicePremiumGiftCode>(id.value);
 	const auto users = std::get_if<InvoicePremiumGiftCodeUsers>(
@@ -314,6 +316,15 @@ MTPInputInvoice Form::inputInvoice() const {
 			MTP_int(message->itemId.bare));
 	} else if (const auto slug = std::get_if<InvoiceSlug>(&_id.value)) {
 		return MTP_inputInvoiceSlug(MTP_string(slug->slug));
+	} else if (const auto credits = std::get_if<InvoiceCredits>(&_id.value)) {
+		return MTP_inputInvoiceStars(MTP_starsTopupOption(
+			credits->product.isEmpty()
+				? MTP_flags(0)
+				: MTP_flags(MTPDstarsTopupOption::Flag::f_store_product),
+			MTP_long(credits->credits),
+			MTP_string(credits->product),
+			MTP_string(credits->currency),
+			MTP_long(credits->amount)));
 	}
 	const auto &giftCode = v::get<InvoicePremiumGiftCode>(_id.value);
 	using Flag = MTPDpremiumGiftCodeOption::Flag;
diff --git a/Telegram/SourceFiles/payments/payments_form.h b/Telegram/SourceFiles/payments/payments_form.h
index 68cb75cebe78f..92448feb6dc24 100644
--- a/Telegram/SourceFiles/payments/payments_form.h
+++ b/Telegram/SourceFiles/payments/payments_form.h
@@ -216,8 +216,21 @@ struct InvoicePremiumGiftCode {
 	int months = 0;
 };
 
+struct InvoiceCredits {
+	not_null<Main::Session*> session;
+	uint64 randomId = 0;
+	uint64 credits = 0;
+	QString product;
+	QString currency;
+	uint64 amount = 0;
+};
+
 struct InvoiceId {
-	std::variant<InvoiceMessage, InvoiceSlug, InvoicePremiumGiftCode> value;
+	std::variant<
+		InvoiceMessage,
+		InvoiceSlug,
+		InvoicePremiumGiftCode,
+		InvoiceCredits> value;
 };
 
 [[nodiscard]] not_null<Main::Session*> SessionFromId(const InvoiceId &id);
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 10ac6e011d536..6509fe0a6daa1 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -13,7 +13,10 @@ For license and copyright information please follow this link:
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "payments/payments_checkout_process.h"
+#include "payments/payments_form.h"
 #include "settings/settings_common_session.h"
+#include "ui/boxes/boost_box.h" // Ui::StartFireworks.
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h"
 #include "ui/image/image_prepare.h"
@@ -33,6 +36,8 @@ For license and copyright information please follow this link:
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
 
+#include <xxhash.h> // XXH64.
+
 #include <QtSvg/QSvgRenderer>
 
 namespace Settings {
@@ -40,6 +45,16 @@ namespace {
 
 using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
 
+[[nodiscard]] uint64 UniqueIdFromOption(
+		const Data::CreditTopupOption &d) {
+	const auto string = QString::number(d.credits)
+		+ d.product
+		+ d.currency
+		+ QString::number(d.amount);
+
+	return XXH64(string.data(), string.size() * sizeof(ushort), 0);
+}
+
 [[nodiscard]] QImage GenerateStarForLightTopBar(QRectF rect) {
 	const auto strokeWidth = 3;
 
@@ -177,6 +192,26 @@ void Credits::setupOptions(not_null<Ui::VerticalLayout*> container) {
 				icon->moveToLeft(st.iconLeft, st.padding.top());
 			}, button->lifetime());
 			button->setClickedCallback([=] {
+				const auto invoice = Payments::InvoiceCredits{
+					.session = &_controller->session(),
+					.randomId = UniqueIdFromOption(option),
+					.credits = option.credits,
+					.product = option.product,
+					.currency = option.currency,
+					.amount = option.amount,
+				};
+
+				const auto weak = Ui::MakeWeak(button);
+				const auto done = [=](Payments::CheckoutResult result) {
+					if (const auto strong = weak.data()) {
+						strong->window()->setFocus();
+						if (result == Payments::CheckoutResult::Paid) {
+							Ui::StartFireworks(this);
+						}
+					}
+				};
+
+				Payments::CheckoutProcess::Start(std::move(invoice), done);
 			});
 			Ui::ToggleChildrenVisibility(button, true);
 		}

From 1a393ddebbf860c1adeaf0dbb80bbf9ca9f89dfc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 17 May 2024 04:21:19 +0300
Subject: [PATCH 216/400] Added star icons with gradient to main settings for
 premium buttons.

---
 .../SourceFiles/settings/settings_main.cpp    | 96 +++++++++++++++++--
 1 file changed, 86 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 19a63e84f14d9..332677a93b12d 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -28,12 +28,15 @@ For license and copyright information please follow this link:
 #include "ui/basic_click_handlers.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/effects/premium_top_bar.h" // Ui::Premium::ColorizedSvg.
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/new_badges.h"
+#include "ui/rect.h"
 #include "ui/vertical_list.h"
 #include "info/profile/info_profile_badge.h"
 #include "info/profile/info_profile_emoji_status_panel.h"
@@ -254,6 +257,77 @@ void Cover::refreshUsernameGeometry(int newWidth) {
 	_username->moveToLeft(usernameLeft, usernameTop, newWidth);
 }
 
+[[nodiscard]] not_null<Ui::SettingsButton*> AddPremiumStar(
+		not_null<Ui::SettingsButton*> button,
+		bool credits) {
+	const auto stops = credits
+		? Ui::Premium::CreditsIconGradientStops()
+		: Ui::Premium::ButtonGradientStops();
+
+	const auto ministarsContainer = Ui::CreateChild<Ui::RpWidget>(button);
+	const auto &buttonSt = button->st();
+	const auto fullHeight = buttonSt.height
+		+ rect::m::sum::v(buttonSt.padding);
+	using MiniStars = Ui::Premium::ColoredMiniStars;
+	const auto ministars = button->lifetime().make_state<MiniStars>(
+		ministarsContainer,
+		false);
+	ministars->setColorOverride(stops);
+
+	ministarsContainer->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(ministarsContainer);
+		{
+			constexpr auto kScale = 0.35;
+			const auto r = ministarsContainer->rect();
+			p.translate(r.center());
+			p.scale(kScale, kScale);
+			p.translate(-r.center());
+		}
+		ministars->paint(p);
+	}, ministarsContainer->lifetime());
+
+	const auto badge = Ui::CreateChild<Ui::RpWidget>(button.get());
+
+	auto star = [&] {
+		const auto factor = style::DevicePixelRatio();
+		const auto size = Size(st::settingsButtonNoIcon.style.font->ascent);
+		auto image = QImage(
+			size * factor,
+			QImage::Format_ARGB32_Premultiplied);
+		image.setDevicePixelRatio(factor);
+		image.fill(Qt::transparent);
+		{
+			auto p = QPainter(&image);
+			auto star = QSvgRenderer(Ui::Premium::ColorizedSvg(stops));
+			star.render(&p, Rect(size));
+		}
+		return image;
+	}();
+	badge->resize(star.size() / style::DevicePixelRatio());
+	badge->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(badge);
+		p.drawImage(0, 0, star);
+	}, badge->lifetime());
+
+	button->sizeValue(
+	) | rpl::start_with_next([=](const QSize &s) {
+		badge->moveToLeft(
+			button->st().iconLeft
+				+ (st::menuIconShop.width() - badge->width()) / 2,
+			(s.height() - badge->height()) / 2);
+		ministarsContainer->moveToLeft(
+			badge->x() - (fullHeight - badge->height()) / 2,
+			0);
+	}, badge->lifetime());
+
+	ministarsContainer->resize(fullHeight, fullHeight);
+	ministars->setCenter(ministarsContainer->rect());
+
+	return button;
+}
+
 } // namespace
 
 void SetupPowerSavingButton(
@@ -406,20 +480,22 @@ void SetupPremium(
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 
-	AddButtonWithIcon(
-		container,
-		tr::lng_premium_summary_title(),
-		st::settingsButton,
-		{ .icon = &st::menuIconPremium }
+	AddPremiumStar(
+		AddButtonWithIcon(
+			container,
+			tr::lng_premium_summary_title(),
+			st::settingsButton),
+		false
 	)->addClickHandler([=] {
 		controller->setPremiumRef("settings");
 		showOther(PremiumId());
 	});
-	AddButtonWithIcon(
-		container,
-		tr::lng_credits_summary_title(),
-		st::settingsButton,
-		{ .icon = &st::menuIconPremium }
+	AddPremiumStar(
+		AddButtonWithIcon(
+			container,
+			tr::lng_credits_summary_title(),
+			st::settingsButton),
+		true
 	)->addClickHandler([=] {
 		controller->setPremiumRef("settings");
 		showOther(CreditsId());

From f0a82de7841a6b2b33b57c5828dc602045d670ae Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 18 May 2024 02:00:46 +0300
Subject: [PATCH 217/400] Fixed editing of last message with uploading media.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index a66ba415ea35c..9c125252ca2a0 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -4008,7 +4008,8 @@ void ListWidget::editMessageRequestNotify(FullMsgId item) const {
 bool ListWidget::lastMessageEditRequestNotify() const {
 	const auto now = base::unixtime::now();
 	auto proj = [&](not_null<Element*> view) {
-		return view->data()->allowsEdit(now);
+		return view->data()->allowsEdit(now)
+			&& !view->data()->isUploading();
 	};
 	const auto &list = ranges::views::reverse(_items);
 	const auto it = ranges::find_if(list, std::move(proj));

From 2bf8cb84d042714a5fdf70348f13ac1148675fc0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 20 May 2024 15:25:48 +0300
Subject: [PATCH 218/400] Added api support of credits status and credits
 history.

---
 Telegram/SourceFiles/api/api_credits.cpp | 96 ++++++++++++++++++++++++
 Telegram/SourceFiles/api/api_credits.h   | 36 +++++++++
 Telegram/SourceFiles/data/data_credits.h | 22 ++++++
 3 files changed, 154 insertions(+)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 96b03a8e8329c..a6f3f3ecaf744 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -8,10 +8,54 @@ For license and copyright information please follow this link:
 #include "api/api_credits.h"
 
 #include "apiwrap.h"
+#include "base/unixtime.h"
 #include "data/data_peer.h"
+#include "data/data_session.h"
 #include "main/main_session.h"
 
 namespace Api {
+namespace {
+
+[[nodiscard]] Data::CreditsHistoryEntry HistoryFromTL(
+		const MTPStarsTransaction &tl) {
+	using HistoryPeerTL = MTPDstarsTransactionPeer;
+	return Data::CreditsHistoryEntry{
+		.id = qs(tl.data().vid()),
+		.credits = tl.data().vstars().v,
+		.date = base::unixtime::parse(tl.data().vdate().v),
+		.peerType = tl.data().vpeer().match([](const HistoryPeerTL &) {
+			return Data::CreditsHistoryEntry::PeerType::Peer;
+		}, [](const MTPDstarsTransactionPeerPlayMarket &) {
+			return Data::CreditsHistoryEntry::PeerType::PlayMarket;
+		}, [](const MTPDstarsTransactionPeerFragment &) {
+			return Data::CreditsHistoryEntry::PeerType::Fragment;
+		}, [](const MTPDstarsTransactionPeerAppStore &) {
+			return Data::CreditsHistoryEntry::PeerType::AppStore;
+		}),
+		.peerId = tl.data().vpeer().match([](const HistoryPeerTL &p) {
+			return peerFromMTP(p.vpeer());
+		}, [](const auto &) {
+			return PeerId(0);
+		}),
+	};
+}
+
+[[nodiscard]] Data::CreditsStatusSlice StatusFromTL(
+		const MTPpayments_StarsStatus &status,
+		not_null<PeerData*> peer) {
+	peer->owner().processUsers(status.data().vusers());
+	peer->owner().processChats(status.data().vchats());
+	return Data::CreditsStatusSlice{
+		.list = ranges::views::all(
+			status.data().vhistory().v
+		) | ranges::views::transform(HistoryFromTL) | ranges::to_vector,
+		.balance = status.data().vbalance().v,
+		.allLoaded = status.data().vnext_offset().has_value(),
+		.token = qs(status.data().vnext_offset().value_or_empty()),
+	};
+}
+
+} // namespace
 
 CreditsTopupOptions::CreditsTopupOptions(not_null<PeerData*> peer)
 : _peer(peer)
@@ -45,6 +89,58 @@ rpl::producer<rpl::no_value, QString> CreditsTopupOptions::request() {
 	};
 }
 
+CreditsStatus::CreditsStatus(not_null<PeerData*> peer)
+: _peer(peer)
+, _api(&peer->session().api().instance()) {
+}
+
+void CreditsStatus::request(
+		const Data::CreditsStatusSlice::OffsetToken &token,
+		Fn<void(Data::CreditsStatusSlice)> done) {
+	if (_requestId) {
+		return;
+	}
+
+	using TLResult = MTPpayments_StarsStatus;
+
+	_requestId = _api.request(MTPpayments_GetStarsStatus(
+		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input
+	)).done([=](const TLResult &result) {
+		_requestId = 0;
+		done(StatusFromTL(result, _peer));
+	}).fail([=] {
+		_requestId = 0;
+		done({});
+	}).send();
+}
+
+CreditsHistory::CreditsHistory(not_null<PeerData*> peer, bool in, bool out)
+: _peer(peer)
+, _flags(HistoryTL::Flags(0)
+	| (in ? HistoryTL::Flag::f_inbound : HistoryTL::Flags(0))
+	| (out ? HistoryTL::Flag::f_outbound : HistoryTL::Flags(0)))
+, _api(&peer->session().api().instance()) {
+}
+
+void CreditsHistory::request(
+		const Data::CreditsStatusSlice::OffsetToken &token,
+		Fn<void(Data::CreditsStatusSlice)> done) {
+	if (_requestId) {
+		return;
+	}
+	_requestId = _api.request(MTPpayments_GetStarsTransactions(
+		MTP_flags(_flags),
+		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input,
+		MTP_string(token)
+	)).done([=](const MTPpayments_StarsStatus &result) {
+		_requestId = 0;
+		done(StatusFromTL(result, _peer));
+	}).fail([=] {
+		_requestId = 0;
+		done({});
+	}).send();
+}
+
 Data::CreditTopupOptions CreditsTopupOptions::options() const {
 	return _options;
 }
diff --git a/Telegram/SourceFiles/api/api_credits.h b/Telegram/SourceFiles/api/api_credits.h
index 61a568b621488..5807f34c74eea 100644
--- a/Telegram/SourceFiles/api/api_credits.h
+++ b/Telegram/SourceFiles/api/api_credits.h
@@ -32,4 +32,40 @@ class CreditsTopupOptions final {
 
 };
 
+class CreditsStatus final {
+public:
+	CreditsStatus(not_null<PeerData*> peer);
+
+	void request(
+		const Data::CreditsStatusSlice::OffsetToken &token,
+		Fn<void(Data::CreditsStatusSlice)> done);
+
+private:
+	const not_null<PeerData*> _peer;
+
+	mtpRequestId _requestId = 0;
+
+	MTP::Sender _api;
+
+};
+
+class CreditsHistory final {
+public:
+	CreditsHistory(not_null<PeerData*> peer, bool in, bool out);
+
+	void request(
+		const Data::CreditsStatusSlice::OffsetToken &token,
+		Fn<void(Data::CreditsStatusSlice)> done);
+
+private:
+	using HistoryTL = MTPpayments_GetStarsTransactions;
+	const not_null<PeerData*> _peer;
+	const HistoryTL::Flags _flags;
+
+	mtpRequestId _requestId = 0;
+
+	MTP::Sender _api;
+
+};
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index db2ffec154d1d..86ccd022f2930 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -18,4 +18,26 @@ struct CreditTopupOption final {
 
 using CreditTopupOptions = std::vector<CreditTopupOption>;
 
+struct CreditsHistoryEntry final {
+	enum class PeerType {
+		Peer,
+		AppStore,
+		PlayMarket,
+		Fragment,
+	};
+	QString id;
+	uint64 credits = 0;
+	QDateTime date;
+	PeerType peerType;
+	PeerId peerId = PeerId(0);
+};
+
+struct CreditsStatusSlice final {
+	using OffsetToken = QString;
+	std::vector<CreditsHistoryEntry> list;
+	uint64 balance = 0;
+	bool allLoaded = false;
+	OffsetToken token;
+};
+
 } // namespace Data

From 65384d54f1fa41e71dec8f278371a67179f095ff Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 20 May 2024 18:53:59 +0300
Subject: [PATCH 219/400] Added random debug data to credits history.

---
 Telegram/SourceFiles/api/api_credits.cpp | 47 ++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index a6f3f3ecaf744..8a609820e9df3 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -12,6 +12,9 @@ For license and copyright information please follow this link:
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
+#if _DEBUG
+#include "base/random.h"
+#endif
 
 namespace Api {
 namespace {
@@ -107,6 +110,10 @@ void CreditsStatus::request(
 		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input
 	)).done([=](const TLResult &result) {
 		_requestId = 0;
+#if _DEBUG
+		done({ .balance = uint64(base::RandomIndex(9999)) });
+		return;
+#endif
 		done(StatusFromTL(result, _peer));
 	}).fail([=] {
 		_requestId = 0;
@@ -134,6 +141,46 @@ void CreditsHistory::request(
 		MTP_string(token)
 	)).done([=](const MTPpayments_StarsStatus &result) {
 		_requestId = 0;
+#if _DEBUG
+		done({
+			.list = [&] {
+				auto a = std::vector<Data::CreditsHistoryEntry>();
+				const auto isIn = _flags & HistoryTL::Flag::f_inbound;
+				const auto isOut = _flags & HistoryTL::Flag::f_outbound;
+				for (auto i = 0; i < base::RandomIndex(10) + 1; i++) {
+					const auto type = (isIn && isOut)
+						? base::RandomIndex(4)
+						: isOut
+						? 0
+						: (base::RandomIndex(3) + 1);
+					a.push_back(Data::CreditsHistoryEntry{
+						.id = QString::number(base::RandomValue<uint64>()),
+						.credits = uint64(
+							std::max(base::RandomIndex(15000), 1)),
+						.date = base::unixtime::parse(
+							std::abs(base::RandomValue<TimeId>())),
+						.peerType = ((type == 0)
+							? Data::CreditsHistoryEntry::PeerType::Peer
+							: (type == 1)
+							? Data::CreditsHistoryEntry::PeerType::PlayMarket
+							: (type == 2)
+							? Data::CreditsHistoryEntry::PeerType::Fragment
+							: Data::CreditsHistoryEntry::PeerType::AppStore),
+						.peerId = (type == 0)
+							? peerFromUser(5000233800)
+							: PeerId(0),
+					});
+				}
+				return a;
+			}(),
+			.balance = 47890,
+			.allLoaded = !token.isEmpty(),
+			.token = token.isEmpty()
+				? QString::number(base::RandomValue<uint64>())
+				: QString(),
+		});
+		return;
+#endif
 		done(StatusFromTL(result, _peer));
 	}).fail([=] {
 		_requestId = 0;

From 154fe63b4390dbb88b58c5e6ddecd48441bbe5d5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 20 May 2024 19:13:22 +0300
Subject: [PATCH 220/400] Implemented list of credit history entries.

---
 .../info_statistics_list_controllers.cpp      | 306 ++++++++++++++++++
 .../info_statistics_list_controllers.h        |  11 +
 Telegram/SourceFiles/ui/effects/credits.style |   2 +
 3 files changed, 319 insertions(+)

diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 1ed6d7884051f..6d6abdec4f054 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -7,9 +7,11 @@ For license and copyright information please follow this link:
 */
 #include "info/statistics/info_statistics_list_controllers.h"
 
+#include "api/api_credits.h"
 #include "api/api_statistics.h"
 #include "boxes/peer_list_controllers.h"
 #include "data/data_channel.h"
+#include "data/data_credits.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
@@ -26,7 +28,10 @@ For license and copyright information please follow this link:
 #include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
+#include "styles/style_credits.h"
 #include "styles/style_dialogs.h" // dialogsStoriesFull.
+#include "styles/style_intro.h" // introFragmentIcon.
+#include "styles/style_layers.h" // boxRowPadding.
 #include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
 #include "styles/style_statistics.h"
@@ -113,6 +118,15 @@ struct BoostsDescriptor final {
 	not_null<PeerData*> peer;
 };
 
+struct CreditsDescriptor final {
+	Data::CreditsStatusSlice firstSlice;
+	Fn<void(const Data::CreditsHistoryEntry &)> entryClickedCallback;
+	not_null<PeerData*> peer;
+	not_null<QImage*> creditIcon;
+	bool in = false;
+	bool out = false;
+};
+
 class PeerListRowWithFullId : public PeerListRow {
 public:
 	PeerListRowWithFullId(
@@ -692,6 +706,254 @@ rpl::producer<int> BoostsController::totalBoostsValue() const {
 	return _totalBoosts.value();
 }
 
+class CreditsRow final : public PeerListRow {
+public:
+	struct Descriptor final {
+		Data::CreditsHistoryEntry entry;
+		not_null<QImage*> creditIcon;
+		int rowHeight = 0;
+	};
+
+	CreditsRow(not_null<PeerData*> peer, const Descriptor &descriptor);
+	CreditsRow(const Descriptor &descriptor);
+
+	[[nodiscard]] const Data::CreditsHistoryEntry &entry() const;
+	[[nodiscard]] QString generateName() override;
+
+	[[nodiscard]] PaintRoundImageCallback generatePaintUserpicCallback(
+		bool forceRound) override;
+
+	QSize rightActionSize() const override;
+	QMargins rightActionMargins() const override;
+	bool rightActionDisabled() const override;
+	void rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) override;
+
+private:
+	void init();
+
+	const Data::CreditsHistoryEntry _entry;
+	not_null<QImage*> const _creditIcon;
+	const int _rowHeight;
+	Ui::EmptyUserpic _userpic;
+
+	Ui::Text::String _rightText;
+};
+
+CreditsRow::CreditsRow(not_null<PeerData*> peer, const Descriptor &descriptor)
+: PeerListRow(peer, UniqueRowIdFromString(descriptor.entry.id))
+, _entry(descriptor.entry)
+, _creditIcon(descriptor.creditIcon)
+, _rowHeight(descriptor.rowHeight)
+, _userpic(Ui::EmptyUserpic::UserpicColor(0), QString()) {
+	init();
+}
+
+CreditsRow::CreditsRow(const Descriptor &descriptor)
+: PeerListRow(UniqueRowIdFromString(descriptor.entry.id))
+, _entry(descriptor.entry)
+, _creditIcon(descriptor.creditIcon)
+, _rowHeight(descriptor.rowHeight)
+, _userpic(
+	[&]() -> Ui::EmptyUserpic::BgColors {
+		switch (descriptor.entry.peerType) {
+		case Data::CreditsHistoryEntry::PeerType::Peer:
+			return Ui::EmptyUserpic::UserpicColor(0);
+		case Data::CreditsHistoryEntry::PeerType::AppStore:
+			return { st::historyPeer7UserpicBg, st::historyPeer7UserpicBg2 };
+		case Data::CreditsHistoryEntry::PeerType::PlayMarket:
+			return { st::historyPeer2UserpicBg, st::historyPeer2UserpicBg2 };
+		case Data::CreditsHistoryEntry::PeerType::Fragment:
+			return { st::historyPeer8UserpicBg, st::historyPeer8UserpicBg2 };
+		}
+		Unexpected("Unknown peer type.");
+	}(),
+	QString()) {
+	init();
+}
+
+void CreditsRow::init() {
+	PeerListRow::setCustomStatus(langDateTimeFull(_entry.date));
+	{
+		constexpr auto kMinus = QChar(0x2212);
+		_rightText.setText(
+			st::semiboldTextStyle,
+			(PeerListRow::special() ? QChar('+') : kMinus)
+				+ Lang::FormatCountDecimal(_entry.credits));
+	}
+}
+
+const Data::CreditsHistoryEntry &CreditsRow::entry() const {
+	return _entry;
+}
+
+QString CreditsRow::generateName() {
+	return !PeerListRow::special()
+		? PeerListRow::generateName()
+		: (_entry.peerType == Data::CreditsHistoryEntry::PeerType::Fragment)
+		? tr::lng_bot_username_description1_link(tr::now)
+		: tr::lng_credits_summary_history_entry_inner_in(tr::now);
+}
+
+PaintRoundImageCallback CreditsRow::generatePaintUserpicCallback(bool force) {
+	if (!PeerListRow::special()) {
+		return PeerListRow::generatePaintUserpicCallback(force);
+	}
+	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
+		_userpic.paintCircle(p, x, y, outerWidth, size);
+		using PeerType = Data::CreditsHistoryEntry::PeerType;
+		((_entry.peerType == PeerType::AppStore)
+			? st::sessionIconiPhone
+			: (_entry.peerType == PeerType::PlayMarket)
+			? st::sessionIconAndroid
+			: st::introFragmentIcon).paintInCenter(p, { x, y, size, size });
+	};
+}
+
+QSize CreditsRow::rightActionSize() const {
+	return QSize(
+			_rightText.maxWidth()
+				+ (_creditIcon->width() / style::DevicePixelRatio())
+				+ st::creditsHistoryRightSkip
+				+ _rightText.style()->font->spacew * 2,
+			_rowHeight);
+}
+
+QMargins CreditsRow::rightActionMargins() const {
+	return QMargins(0, 0, st::boxRowPadding.right(), 0);
+}
+
+bool CreditsRow::rightActionDisabled() const {
+	return true;
+}
+
+void CreditsRow::rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) {
+	const auto &font = _rightText.style()->font;
+	y += _rowHeight / 2;
+	p.setPen(PeerListRow::special()
+		? st::boxTextFgGood
+		: st::menuIconAttentionColor);
+	x += st::creditsHistoryRightSkip;
+	_rightText.draw(p, Ui::Text::PaintContext{
+		.position = QPoint(x, y - font->height / 2),
+		.availableWidth = outerWidth,
+		.outerWidth = outerWidth,
+	});
+	x += _rightText.maxWidth() + font->spacew * 2;
+	p.drawImage(
+		x,
+		y -(_creditIcon->height() / style::DevicePixelRatio()) / 2,
+		*_creditIcon);
+}
+
+class CreditsController final : public PeerListController {
+public:
+	explicit CreditsController(CreditsDescriptor d);
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	void loadMoreRows() override;
+
+	[[nodiscard]] bool skipRequest() const;
+	void requestNext();
+
+	[[nodiscard]] rpl::producer<bool> allLoadedValue() const;
+
+private:
+	void applySlice(const Data::CreditsStatusSlice &slice);
+
+	const not_null<Main::Session*> _session;
+	Fn<void(const Data::CreditsHistoryEntry &)> _entryClickedCallback;
+	not_null<QImage*> const _creditIcon;
+
+	Api::CreditsHistory _api;
+	Data::CreditsStatusSlice _firstSlice;
+	Data::CreditsStatusSlice::OffsetToken _apiToken;
+
+	rpl::variable<bool> _allLoaded = false;
+	bool _requesting = false;
+
+};
+
+CreditsController::CreditsController(CreditsDescriptor d)
+: _session(&d.peer->session())
+, _entryClickedCallback(std::move(d.entryClickedCallback))
+, _creditIcon(d.creditIcon)
+, _api(d.peer, d.in, d.out)
+, _firstSlice(std::move(d.firstSlice)) {
+	PeerListController::setStyleOverrides(&st::boostsListBox);
+}
+
+Main::Session &CreditsController::session() const {
+	return *_session;
+}
+
+bool CreditsController::skipRequest() const {
+	return _requesting || _allLoaded.current();
+}
+
+void CreditsController::requestNext() {
+	_requesting = true;
+	_api.request(_apiToken, [=](const Data::CreditsStatusSlice &s) {
+		_requesting = false;
+		applySlice(s);
+	});
+}
+
+void CreditsController::prepare() {
+	applySlice(base::take(_firstSlice));
+	delegate()->peerListRefreshRows();
+}
+
+void CreditsController::loadMoreRows() {
+}
+
+void CreditsController::applySlice(const Data::CreditsStatusSlice &slice) {
+	_allLoaded = slice.allLoaded;
+	_apiToken = slice.token;
+
+	for (const auto &item : slice.list) {
+		auto row = [&] {
+			const auto descriptor = CreditsRow::Descriptor{
+				.entry = item,
+				.creditIcon = _creditIcon,
+				.rowHeight = computeListSt().item.height,
+			};
+			if (item.peerId) {
+				const auto peer = session().data().peer(item.peerId);
+				return std::make_unique<CreditsRow>(peer, descriptor);
+			} else {
+				return std::make_unique<CreditsRow>(descriptor);
+			}
+		}();
+		delegate()->peerListAppendRow(std::move(row));
+	}
+	delegate()->peerListRefreshRows();
+}
+
+void CreditsController::rowClicked(not_null<PeerListRow*> row) {
+	if (_entryClickedCallback) {
+		_entryClickedCallback(
+			static_cast<const CreditsRow*>(row.get())->entry());
+	}
+}
+
+rpl::producer<bool> CreditsController::allLoadedValue() const {
+	return _allLoaded.value();
+}
+
 } // namespace
 
 void AddPublicForwards(
@@ -843,4 +1105,48 @@ void AddBoostsList(
 	button->setClickedCallback(showMore);
 }
 
+void AddCreditsHistoryList(
+		const Data::CreditsStatusSlice &firstSlice,
+		not_null<Ui::VerticalLayout*> container,
+		Fn<void(const Data::CreditsHistoryEntry &)> callback,
+		not_null<PeerData*> self,
+		not_null<QImage*> icon,
+		bool in,
+		bool out) {
+	struct State final {
+		State(CreditsDescriptor d) : controller(std::move(d)) {
+		}
+		PeerListContentDelegateSimple delegate;
+		CreditsController controller;
+	};
+	auto d = CreditsDescriptor{ firstSlice, callback, self, icon, in, out };
+	const auto state = container->lifetime().make_state<State>(std::move(d));
+
+	state->delegate.setContent(container->add(
+		object_ptr<PeerListContent>(container, &state->controller)));
+	state->controller.setDelegate(&state->delegate);
+
+	const auto wrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			container,
+			object_ptr<Ui::SettingsButton>(
+				container,
+				tr::lng_stories_show_more(),
+				st::statisticsShowMoreButton)),
+		{ 0, -st::settingsButton.padding.top(), 0, 0 });
+	const auto button = wrap->entity();
+	AddArrow(button);
+
+	const auto showMore = [=] {
+		if (!state->controller.skipRequest()) {
+			state->controller.requestNext();
+			container->resizeToWidth(container->width());
+		}
+	};
+	wrap->toggleOn(
+		state->controller.allLoadedValue() | rpl::map(!rpl::mappers::_1),
+		anim::type::instant);
+	button->setClickedCallback(showMore);
+}
+
 } // namespace Info::Statistics
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h
index 2a2dfe93a0d2a..0e3d000195f6f 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h
@@ -16,6 +16,8 @@ class VerticalLayout;
 namespace Data {
 struct Boost;
 struct BoostsListSlice;
+struct CreditsHistoryEntry;
+struct CreditsStatusSlice;
 struct PublicForwardsSlice;
 struct RecentPostId;
 struct SupergroupStatistics;
@@ -44,4 +46,13 @@ void AddBoostsList(
 	not_null<PeerData*> peer,
 	rpl::producer<QString> title);
 
+void AddCreditsHistoryList(
+	const Data::CreditsStatusSlice &firstSlice,
+	not_null<Ui::VerticalLayout*> container,
+	Fn<void(const Data::CreditsHistoryEntry &)> entryClickedCallback,
+	not_null<PeerData*> self,
+	not_null<QImage*> creditIcon,
+	bool in,
+	bool out);
+
 } // namespace Info::Statistics
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 4c27ea541e2ac..355d0fc5bb5a5 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -22,3 +22,5 @@ creditsTopupButton: SettingsButton(settingsButton) {
 creditsTopupPrice: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 }
+
+creditsHistoryRightSkip: 10px;

From ca37ffa08691230c40a33e7fb7f83a46fb8d9fc3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 20 May 2024 19:13:31 +0300
Subject: [PATCH 221/400] Added list of credit history entries to credits
 settings.

---
 .../SourceFiles/settings/settings_credits.cpp | 165 ++++++++++++++++++
 1 file changed, 165 insertions(+)

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 6509fe0a6daa1..dc7afd1c104b5 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -11,11 +11,13 @@ For license and copyright information please follow this link:
 #include "core/click_handler_types.h"
 #include "data/data_user.h"
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
+#include "info/statistics/info_statistics_list_controllers.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_form.h"
 #include "settings/settings_common_session.h"
+#include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/boost_box.h" // Ui::StartFireworks.
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h"
@@ -26,6 +28,7 @@ For license and copyright information please follow this link:
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/slide_wrap.h"
@@ -35,6 +38,7 @@ For license and copyright information please follow this link:
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
+#include "styles/style_statistics.h"
 
 #include <xxhash.h> // XXH64.
 
@@ -103,6 +107,7 @@ class Credits : public Section<Credits> {
 private:
 	void setupContent();
 	void setupOptions(not_null<Ui::VerticalLayout*> container);
+	void setupHistory(not_null<Ui::VerticalLayout*> container);
 
 	const not_null<Window::SessionController*> _controller;
 
@@ -245,9 +250,169 @@ void Credits::setupOptions(not_null<Ui::VerticalLayout*> container) {
 	}, content->lifetime());
 }
 
+void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
+	const auto history = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto content = history->entity();
+
+	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
+
+	const auto fill = [=](
+			const Data::CreditsStatusSlice &fullSlice,
+			const Data::CreditsStatusSlice &inSlice,
+			const Data::CreditsStatusSlice &outSlice) {
+		const auto inner = content;
+		if (fullSlice.list.empty()) {
+			return;
+		}
+		const auto hasOneTab = inSlice.list.empty() && outSlice.list.empty();
+		const auto hasIn = !inSlice.list.empty();
+		const auto hasOut = !outSlice.list.empty();
+		const auto fullTabText = tr::lng_credits_summary_history_tab_full(
+			tr::now);
+		const auto inTabText = tr::lng_credits_summary_history_tab_in(
+			tr::now);
+		const auto outTabText = tr::lng_credits_summary_history_tab_out(
+			tr::now);
+		if (hasOneTab) {
+			Ui::AddSkip(inner);
+			const auto header = inner->add(
+				object_ptr<Statistic::Header>(inner),
+				st::statisticsLayerMargins
+					+ st::boostsChartHeaderPadding);
+			header->resizeToWidth(header->width());
+			header->setTitle(fullTabText);
+			header->setSubTitle({});
+		}
+
+		class Slider final : public Ui::SettingsSlider {
+		public:
+			using Ui::SettingsSlider::SettingsSlider;
+			void setNaturalWidth(int w) {
+				_naturalWidth = w;
+			}
+			int naturalWidth() const override {
+				return _naturalWidth;
+			}
+
+		private:
+			int _naturalWidth = 0;
+
+		};
+
+		const auto slider = inner->add(
+			object_ptr<Ui::SlideWrap<Slider>>(
+				inner,
+				object_ptr<Slider>(inner, st::defaultTabsSlider)),
+			st::boxRowPadding);
+		slider->toggle(!hasOneTab, anim::type::instant);
+
+		slider->entity()->addSection(fullTabText);
+		if (hasIn) {
+			slider->entity()->addSection(inTabText);
+		}
+		if (hasOut) {
+			slider->entity()->addSection(outTabText);
+		}
+
+		{
+			const auto &st = st::defaultTabsSlider;
+			slider->entity()->setNaturalWidth(0
+				+ st.labelStyle.font->width(fullTabText)
+				+ (hasIn ? st.labelStyle.font->width(inTabText) : 0)
+				+ (hasOut ? st.labelStyle.font->width(outTabText) : 0)
+				+ rect::m::sum::h(st::boxRowPadding));
+		}
+
+		const auto fullWrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+		const auto inWrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+		const auto outWrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+
+		rpl::single(0) | rpl::then(
+			slider->entity()->sectionActivated()
+		) | rpl::start_with_next([=](int index) {
+			if (index == 0) {
+				fullWrap->toggle(true, anim::type::instant);
+				inWrap->toggle(false, anim::type::instant);
+				outWrap->toggle(false, anim::type::instant);
+			} else if (index == 1) {
+				inWrap->toggle(true, anim::type::instant);
+				fullWrap->toggle(false, anim::type::instant);
+				outWrap->toggle(false, anim::type::instant);
+			} else {
+				outWrap->toggle(true, anim::type::instant);
+				fullWrap->toggle(false, anim::type::instant);
+				inWrap->toggle(false, anim::type::instant);
+			}
+		}, inner->lifetime());
+
+		const auto entryClicked = [=](const Data::CreditsHistoryEntry &e) {
+		};
+
+		Info::Statistics::AddCreditsHistoryList(
+			fullSlice,
+			fullWrap->entity(),
+			entryClicked,
+			_controller->session().user(),
+			&_star,
+			true,
+			true);
+		Info::Statistics::AddCreditsHistoryList(
+			inSlice,
+			inWrap->entity(),
+			entryClicked,
+			_controller->session().user(),
+			&_star,
+			true,
+			false);
+		Info::Statistics::AddCreditsHistoryList(
+			outSlice,
+			outWrap->entity(),
+			std::move(entryClicked),
+			_controller->session().user(),
+			&_star,
+			false,
+			true);
+
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+
+		inner->resizeToWidth(container->width());
+	};
+
+	const auto apiLifetime = content->lifetime().make_state<rpl::lifetime>();
+	{
+		using Api = Api::CreditsHistory;
+		const auto self = _controller->session().user();
+		const auto apiFull = apiLifetime->make_state<Api>(self, true, true);
+		const auto apiIn = apiLifetime->make_state<Api>(self, true, false);
+		const auto apiOut = apiLifetime->make_state<Api>(self, false, true);
+		apiFull->request({}, [=](Data::CreditsStatusSlice fullSlice) {
+			apiIn->request({}, [=](Data::CreditsStatusSlice inSlice) {
+				apiOut->request({}, [=](Data::CreditsStatusSlice outSlice) {
+					fill(fullSlice, inSlice, outSlice);
+					apiLifetime->destroy();
+				});
+			});
+		});
+	}
+}
+
 void Credits::setupContent() {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
 	setupOptions(content);
+	setupHistory(content);
 
 	Ui::ResizeFitChild(this, content);
 }

From d81c3554cc080a9e63bf7cbbd5a462cf1a23a1b7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 21 May 2024 04:17:39 +0300
Subject: [PATCH 222/400] Added multiple icons to credits topup options.

---
 .../SourceFiles/settings/settings_credits.cpp | 97 ++++++++++++++-----
 1 file changed, 74 insertions(+), 23 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index dc7afd1c104b5..2b6064abbb33d 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -59,28 +59,55 @@ using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
 	return XXH64(string.data(), string.size() * sizeof(ushort), 0);
 }
 
-[[nodiscard]] QImage GenerateStarForLightTopBar(QRectF rect) {
-	const auto strokeWidth = 3;
+[[nodiscard]] QImage GenerateStars(int height, int count) {
+	constexpr auto kOutlineWidth = .6;
+	constexpr auto kStrokeWidth = 3;
+	constexpr auto kShift = 3;
 
 	auto colorized = qs(Ui::Premium::ColorizedSvg(
 		Ui::Premium::CreditsIconGradientStops()));
 	colorized.replace(
-		"stroke=\"none\"",
-		"stroke=\"" + st::creditsStroke->c.name() + "\"");
-	colorized.replace("stroke-width=\"1\"", "stroke-width=\"3\"");
+		u"stroke=\"none\""_q,
+		u"stroke=\"%1\""_q.arg(st::creditsStroke->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(strokeWidth));
+	svg.setViewBox(svg.viewBox() + Margins(kStrokeWidth));
+
+	const auto starSize = Size(height - kOutlineWidth * 2);
 
-	const auto size = Size(st::settingsButton.height);
 	auto frame = QImage(
-		size * style::DevicePixelRatio(),
+		QSize(
+			(height + kShift * (count - 1)) * style::DevicePixelRatio(),
+			height * style::DevicePixelRatio()),
 		QImage::Format_ARGB32_Premultiplied);
 	frame.setDevicePixelRatio(style::DevicePixelRatio());
-
 	frame.fill(Qt::transparent);
+	const auto drawSingle = [&](QPainter &q) {
+		const auto s = kOutlineWidth;
+		q.save();
+		q.translate(s, s);
+		q.setCompositionMode(QPainter::CompositionMode_Clear);
+		svg.render(&q, QRectF(QPointF(s, 0), starSize));
+		svg.render(&q, QRectF(QPointF(s, s), starSize));
+		svg.render(&q, QRectF(QPointF(0, s), starSize));
+		svg.render(&q, QRectF(QPointF(-s, s), starSize));
+		svg.render(&q, QRectF(QPointF(-s, 0), starSize));
+		svg.render(&q, QRectF(QPointF(-s, -s), starSize));
+		svg.render(&q, QRectF(QPointF(0, -s), starSize));
+		svg.render(&q, QRectF(QPointF(s, -s), starSize));
+		q.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		svg.render(&q, Rect(starSize));
+		q.restore();
+	};
 	{
 		auto q = QPainter(&frame);
-		svg.render(&q, Rect(size));
+		q.translate(frame.width() / style::DevicePixelRatio() - height, 0);
+		for (auto i = count; i > 0; --i) {
+			drawSingle(q);
+			q.translate(-kShift, 0);
+		}
 	}
 	return frame;
 }
@@ -130,7 +157,7 @@ Credits::Credits(
 	not_null<Window::SessionController*> controller)
 : Section(parent)
 , _controller(controller)
-, _star(GenerateStarForLightTopBar({})) {
+, _star(GenerateStars(st::creditsTopupButton.height, 1)) {
 	setupContent();
 }
 
@@ -172,29 +199,53 @@ void Credits::setupOptions(not_null<Ui::VerticalLayout*> container) {
 		Ui::AddSubsectionTitle(
 			content,
 			tr::lng_credits_summary_options_subtitle());
-		for (const auto &option : options) {
+		const auto &st = st::creditsTopupButton;
+		const auto diffBetweenTextAndStar = st.padding.left()
+			- st.iconLeft
+			- (_star.width() / style::DevicePixelRatio());
+		const auto buttonHeight = st.height + rect::m::sum::v(st.padding);
+		for (auto i = 0; i < options.size(); i++) {
+			const auto &option = options[i];
 			const auto button = content->add(object_ptr<Ui::SettingsButton>(
 				content,
+				rpl::never<QString>(),
+				st));
+			const auto text = button->lifetime().make_state<Ui::Text::String>(
+				st.style,
 				tr::lng_credits_summary_options_credits(
+					tr::now,
 					lt_count_decimal,
-					rpl::single(option.credits) | tr::to_count()),
-				st::creditsTopupButton));
-			const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
-			icon->resize(Size(button->st().height));
-			icon->paintRequest(
-			) | rpl::start_with_next([=](const QRect &rect) {
-				auto p = QPainter(icon);
-				p.drawImage(0, 0, _star);
-			}, icon->lifetime());
+					option.credits));
 			const auto price = Ui::CreateChild<Ui::FlatLabel>(
 				button,
 				Ui::FillAmountAndCurrency(option.amount, option.currency),
 				st::creditsTopupPrice);
+			const auto inner = Ui::CreateChild<Ui::RpWidget>(button);
+			const auto stars = GenerateStars(st.height, (i + 1));
+			inner->paintRequest(
+			) | rpl::start_with_next([=](const QRect &rect) {
+				auto p = QPainter(inner);
+				p.drawImage(
+					0,
+					(buttonHeight - stars.height()) / 2,
+					stars);
+				const auto textLeft = diffBetweenTextAndStar
+					+ stars.width() / style::DevicePixelRatio();
+				p.setPen(st.textFg);
+				text->draw(p, {
+					.position = QPoint(textLeft, 0),
+					.availableWidth = inner->width() - textLeft,
+				});
+			}, inner->lifetime());
 			button->sizeValue(
 			) | rpl::start_with_next([=](const QSize &size) {
-				const auto &st = button->st();
 				price->moveToRight(st.padding.right(), st.padding.top());
-				icon->moveToLeft(st.iconLeft, st.padding.top());
+				inner->moveToLeft(st.iconLeft, st.padding.top());
+				inner->resize(
+					size.width()
+						- rect::m::sum::h(st.padding)
+						- price->width(),
+					buttonHeight);
 			}, button->lifetime());
 			button->setClickedCallback([=] {
 				const auto invoice = Payments::InvoiceCredits{

From 030d35ea7ea043216f82b7932a28745f2fd464df Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 21 May 2024 05:19:32 +0300
Subject: [PATCH 223/400] Added initial implementation of balance in credits
 settings.

---
 .../SourceFiles/settings/settings_credits.cpp | 69 ++++++++++++++++++-
 Telegram/SourceFiles/ui/effects/credits.style |  1 +
 .../ui/effects/premium_top_bar.cpp            |  7 +-
 3 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 2b6064abbb33d..4ed6e8ac2661d 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -139,6 +139,7 @@ class Credits : public Section<Credits> {
 	const not_null<Window::SessionController*> _controller;
 
 	QImage _star;
+	QImage _balanceStar;
 
 	base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
 	base::unique_qptr<Ui::IconButton> _close;
@@ -157,7 +158,8 @@ Credits::Credits(
 	not_null<Window::SessionController*> controller)
 : Section(parent)
 , _controller(controller)
-, _star(GenerateStars(st::creditsTopupButton.height, 1)) {
+, _star(GenerateStars(st::creditsTopupButton.height, 1))
+, _balanceStar(GenerateStars(st::creditsBalanceStarHeight, 1)) {
 	setupContent();
 }
 
@@ -514,6 +516,71 @@ QPointer<Ui::RpWidget> Credits::createPinnedToTop(
 		}
 	}, content->lifetime());
 
+	const auto balance = Ui::CreateChild<Ui::RpWidget>(content);
+	{
+		const auto starSize = _balanceStar.size() / style::DevicePixelRatio();
+		const auto label = balance->lifetime().make_state<Ui::Text::String>(
+			st::defaultTextStyle,
+			tr::lng_credits_summary_balance(tr::now));
+		const auto count = balance->lifetime().make_state<Ui::Text::String>(
+			st::semiboldTextStyle,
+			tr::lng_contacts_loading(tr::now));
+		const auto api = balance->lifetime().make_state<Api::CreditsStatus>(
+			_controller->session().user());
+		const auto diffBetweenStarAndCount = count->style()->font->spacew;
+		const auto resize = [=] {
+			balance->resize(
+				std::max(
+					label->maxWidth(),
+					count->maxWidth()
+						+ starSize.width()
+						+ diffBetweenStarAndCount),
+				label->style()->font->height + starSize.height());
+		};
+		api->request({}, [=](Data::CreditsStatusSlice slice) {
+			count->setText(
+				st::semiboldTextStyle,
+				Lang::FormatCountToShort(slice.balance).string);
+			resize();
+		});
+		balance->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = QPainter(balance);
+
+			p.setPen(st::boxTextFg);
+
+			label->draw(p, {
+				.position = QPoint(balance->width() - label->maxWidth(), 0),
+				.availableWidth = balance->width(),
+			});
+			count->draw(p, {
+				.position = QPoint(
+					balance->width() - count->maxWidth(),
+					label->minHeight()
+						+ (starSize.height() - count->minHeight()) / 2),
+				.availableWidth = balance->width(),
+			});
+			p.drawImage(
+				balance->width()
+					- count->maxWidth()
+					- starSize.width()
+					- diffBetweenStarAndCount,
+				label->minHeight(),
+				_balanceStar);
+		}, balance->lifetime());
+		rpl::combine(
+			balance->sizeValue(),
+			content->sizeValue()
+		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+			balance->moveToRight(
+				(_close
+					? _close->width() + st::creditsHistoryRightSkip
+					: st::creditsHistoryRightSkip * 2),
+				st::creditsHistoryRightSkip);
+			balance->update();
+		}, balance->lifetime());
+	}
+
 	_wrap.value(
 	) | rpl::start_with_next([=](Info::Wrap wrap) {
 		const auto isLayer = (wrap == Info::Wrap::Layer);
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 355d0fc5bb5a5..8a1afec1961e2 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -24,3 +24,4 @@ creditsTopupPrice: FlatLabel(defaultFlatLabel) {
 }
 
 creditsHistoryRightSkip: 10px;
+creditsBalanceStarHeight: 20px;
diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
index fd3d119509b5f..999a077d464ed 100644
--- a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
@@ -256,11 +256,8 @@ void TopBar::resizeEvent(QResizeEvent *e) {
 	const auto progress = (max > min)
 		? ((e->size().height() - min) / float64(max - min))
 		: 1.;
-	_progress.top = 1. -
-		std::clamp(
-			(1. - progress) / kBodyAnimationPart,
-			0.,
-			1.);
+	_progress.top = 1.
+		- std::clamp((1. - progress) / kBodyAnimationPart, 0., 1.);
 	_progress.body = _progress.top;
 	_progress.title = 1. - progress;
 	_progress.scaleTitle = 1. + kTitleAdditionalScale * progress;

From 6336df2bd6ec8c140cb891fa42b7114d9112645c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 21 May 2024 05:22:27 +0300
Subject: [PATCH 224/400] Slightly improved code style for decimal counts.

---
 .../view/reactions/history_view_reactions_tabs.cpp    | 11 ++++++-----
 .../statistics/widgets/point_details_widget.cpp       |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp
index c3b5848cc6ddb..f3b23804fce17 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp
@@ -7,13 +7,14 @@ For license and copyright information please follow this link:
 */
 #include "history/view/reactions/history_view_reactions_tabs.h"
 
-#include "ui/rp_widget.h"
+#include "data/data_message_reaction_id.h"
+#include "lang/lang_tag.h"
 #include "ui/abstract_button.h"
-#include "ui/painter.h"
 #include "ui/controls/who_reacted_context_action.h"
-#include "data/data_message_reaction_id.h"
-#include "styles/style_widgets.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
 #include "styles/style_chat.h"
+#include "styles/style_widgets.h"
 
 namespace HistoryView::Reactions {
 namespace {
@@ -35,7 +36,7 @@ not_null<Ui::AbstractButton*> CreateTab(
 		bool selected = false;
 	};
 	const auto stm = &st.item;
-	const auto text = QString("%L1").arg(count);
+	const auto text = Lang::FormatCountDecimal(count);
 	const auto font = st::semiboldFont;
 	const auto textWidth = font->width(text);
 	const auto result = Ui::CreateChild<Ui::AbstractButton>(parent.get());
diff --git a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
index 50d56fec5d893..305010866461e 100644
--- a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
@@ -81,7 +81,7 @@ void PaintDetails(
 		line.name);
 	auto value = Ui::Text::String(
 		st::statisticsDetailsPopupStyle,
-		QString("%L1").arg(absoluteValue));
+		Lang::FormatCountDecimal(absoluteValue));
 	const auto nameWidth = name.maxWidth();
 	const auto valueWidth = value.maxWidth();
 
@@ -177,7 +177,7 @@ PointDetailsWidget::PointDetailsWidget(
 	const auto calculatedWidth = [&]{
 		const auto maxValueText = Ui::Text::String(
 			_textStyle,
-			QString("%L1").arg(maxAbsoluteValue));
+			Lang::FormatCountDecimal(maxAbsoluteValue));
 		const auto maxValueTextWidth = maxValueText.maxWidth();
 
 		auto maxNameTextWidth = 0;
@@ -284,7 +284,7 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 		textLine.name.setText(_textStyle, dataLine.name);
 		textLine.value.setText(
 			_textStyle,
-			QString("%L1").arg(dataLine.y[xIndex]));
+			Lang::FormatCountDecimal(dataLine.y[xIndex]));
 		hasPositiveValues |= (dataLine.y[xIndex] > 0);
 		textLine.valueColor = QColor(dataLine.color);
 		if (_chartData.currencyRate) {

From 42d6d0d58af6d84c212a7d7bc219c53888229c3d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 21 May 2024 05:42:03 +0300
Subject: [PATCH 225/400] Added tooltip to balance label in credits settings
 for high values.

---
 .../SourceFiles/settings/settings_credits.cpp | 43 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 4ed6e8ac2661d..a31c68e10c142 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -30,6 +30,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/tooltip.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
@@ -49,6 +50,45 @@ namespace {
 
 using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
 
+class Balance final
+	: public Ui::RpWidget
+	, public Ui::AbstractTooltipShower {
+public:
+	using Ui::RpWidget::RpWidget;
+
+	void setBalance(uint64 balance) {
+		_balance = balance;
+		_tooltip = Lang::FormatCountDecimal(balance);
+	}
+
+	void enterEventHook(QEnterEvent *e) override {
+		if (_balance >= 10'000) {
+			Ui::Tooltip::Show(1000, this);
+		}
+	}
+
+	void leaveEventHook(QEvent *e) override {
+		Ui::Tooltip::Hide();
+	}
+
+	QString tooltipText() const override {
+		return _tooltip;
+	}
+
+	QPoint tooltipPos() const override {
+		return QCursor::pos();
+	}
+
+	bool tooltipWindowActive() const override {
+		return Ui::AppInFocus() && Ui::InFocusChain(window());
+	}
+
+private:
+	QString _tooltip;
+	uint64 _balance = 0;
+
+};
+
 [[nodiscard]] uint64 UniqueIdFromOption(
 		const Data::CreditTopupOption &d) {
 	const auto string = QString::number(d.credits)
@@ -516,7 +556,7 @@ QPointer<Ui::RpWidget> Credits::createPinnedToTop(
 		}
 	}, content->lifetime());
 
-	const auto balance = Ui::CreateChild<Ui::RpWidget>(content);
+	const auto balance = Ui::CreateChild<Balance>(content);
 	{
 		const auto starSize = _balanceStar.size() / style::DevicePixelRatio();
 		const auto label = balance->lifetime().make_state<Ui::Text::String>(
@@ -541,6 +581,7 @@ QPointer<Ui::RpWidget> Credits::createPinnedToTop(
 			count->setText(
 				st::semiboldTextStyle,
 				Lang::FormatCountToShort(slice.balance).string);
+			balance->setBalance(slice.balance);
 			resize();
 		});
 		balance->paintRequest(

From 5adde6c93afddae2bd1211fe7ba050021edde514 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 May 2024 15:02:34 +0400
Subject: [PATCH 226/400] Fix build on Windows.

---
 .../info/statistics/info_statistics_list_controllers.cpp        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 6d6abdec4f054..285a0e1a805ea 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -847,8 +847,8 @@ void CreditsRow::rightActionPaint(
 	x += st::creditsHistoryRightSkip;
 	_rightText.draw(p, Ui::Text::PaintContext{
 		.position = QPoint(x, y - font->height / 2),
-		.availableWidth = outerWidth,
 		.outerWidth = outerWidth,
+		.availableWidth = outerWidth,
 	});
 	x += _rightText.maxWidth() + font->spacew * 2;
 	p.drawImage(

From 8eb24f620d4b6fb5571fc8a00e39b9aa546a0cdf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 May 2024 16:22:45 +0400
Subject: [PATCH 227/400] Update API scheme on layer 181.

---
 Telegram/SourceFiles/api/api_credits.cpp       | 4 ++++
 Telegram/SourceFiles/api/api_text_entities.cpp | 3 ++-
 Telegram/SourceFiles/data/data_credits.h       | 2 ++
 Telegram/SourceFiles/mtproto/scheme/api.tl     | 4 +++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 8a609820e9df3..32497e2495aab 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -34,6 +34,10 @@ namespace {
 			return Data::CreditsHistoryEntry::PeerType::Fragment;
 		}, [](const MTPDstarsTransactionPeerAppStore &) {
 			return Data::CreditsHistoryEntry::PeerType::AppStore;
+		}, [](const MTPDstarsTransactionPeerUnsupported &) {
+			return Data::CreditsHistoryEntry::PeerType::Unsupported;
+		}, [](const MTPDstarsTransactionPeerPremiumBot &) {
+			return Data::CreditsHistoryEntry::PeerType::PremiumBot;
 		}),
 		.peerId = tl.data().vpeer().match([](const HistoryPeerTL &p) {
 			return peerFromMTP(p.vpeer());
diff --git a/Telegram/SourceFiles/api/api_text_entities.cpp b/Telegram/SourceFiles/api/api_text_entities.cpp
index 44a689ff4be25..3c5098911b384 100644
--- a/Telegram/SourceFiles/api/api_text_entities.cpp
+++ b/Telegram/SourceFiles/api/api_text_entities.cpp
@@ -311,7 +311,8 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 					MTP_string(entity.data())));
 		} break;
 		case EntityType::Blockquote: {
-			v.push_back(MTP_messageEntityBlockquote(offset, length));
+			v.push_back(
+				MTP_messageEntityBlockquote(MTP_flags(0), offset, length));
 		} break;
 		case EntityType::Spoiler: {
 			v.push_back(MTP_messageEntitySpoiler(offset, length));
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 86ccd022f2930..cb0310c93924b 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -24,6 +24,8 @@ struct CreditsHistoryEntry final {
 		AppStore,
 		PlayMarket,
 		Fragment,
+		Unsupported,
+		PremiumBot,
 	};
 	QString id;
 	uint64 credits = 0;
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 330e20ea7e3bd..deb1d9e807460 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -671,7 +671,7 @@ messageEntityStrike#bf0693d4 offset:int length:int = MessageEntity;
 messageEntityBankCard#761e6af4 offset:int length:int = MessageEntity;
 messageEntitySpoiler#32ca960f offset:int length:int = MessageEntity;
 messageEntityCustomEmoji#c8cf05f8 offset:int length:int document_id:long = MessageEntity;
-messageEntityBlockquote#20df5d0 offset:int length:int = MessageEntity;
+messageEntityBlockquote#f1ccaaac flags:# collapsed:flags.0?true offset:int length:int = MessageEntity;
 
 inputChannelEmpty#ee8c1e86 = InputChannel;
 inputChannel#f35aec28 channel_id:long access_hash:long = InputChannel;
@@ -1793,8 +1793,10 @@ messages.availableEffects#bddb616e hash:int effects:Vector<AvailableEffect> docu
 
 factCheck#b89bfccf flags:# need_check:flags.0?true country:flags.1?string text:flags.1?TextWithEntities hash:long = FactCheck;
 
+starsTransactionPeerUnsupported#95f2bfe4 = StarsTransactionPeer;
 starsTransactionPeerAppStore#b457b375 = StarsTransactionPeer;
 starsTransactionPeerPlayMarket#7b560a0b = StarsTransactionPeer;
+starsTransactionPeerPremiumBot#250dbaf8 = StarsTransactionPeer;
 starsTransactionPeerFragment#e92fd902 = StarsTransactionPeer;
 starsTransactionPeer#d80da15d peer:Peer = StarsTransactionPeer;
 

From 5e29f382cdd61f3a143dbe10969fb03ec1f8c130 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 21 May 2024 16:22:18 +0300
Subject: [PATCH 228/400] Fixed build with Xcode.

---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 2 +-
 Telegram/SourceFiles/dialogs/dialogs_key.h            | 1 +
 Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp  | 6 +++---
 Telegram/SourceFiles/mainwidget.cpp                   | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 9e79f3ac2539f..a56e28b2fbc4f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -801,7 +801,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			p.fillRect(dialogsClip, currentBg());
 		}
 	} else if (_state == WidgetState::Filtered) {
-		auto top = 0;
+		[[maybe_unused]] auto top = 0;
 		if (!_hashtagResults.empty()) {
 			auto from = floorclamp(r.y(), st::mentionHeight, 0, _hashtagResults.size());
 			auto to = ceilclamp(r.y() + r.height(), st::mentionHeight, 0, _hashtagResults.size());
diff --git a/Telegram/SourceFiles/dialogs/dialogs_key.h b/Telegram/SourceFiles/dialogs/dialogs_key.h
index 2f631288e2b2f..8b5d22ed7040d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_key.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_key.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/qt/qt_compare.h"
+#include "data/data_message_reaction_id.h"
 
 class History;
 class PeerData;
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
index a8615ae11d955..24fc2150754c4 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
@@ -56,9 +56,9 @@ FixedHashtagSearchQuery FixHashtagSearchQuery(
 		const QString &query,
 		int cursorPosition) {
 	const auto trimmed = query.trimmed();
-	const auto hash = trimmed.isEmpty()
+	const auto hash = int(trimmed.isEmpty()
 		? query.size()
-		: query.indexOf(trimmed);
+		: query.indexOf(trimmed));
 	const auto start = std::min(cursorPosition, hash);
 	auto result = query.mid(0, start);
 	for (const auto &ch : query.mid(start)) {
@@ -198,4 +198,4 @@ void ChatSearchTabs::paintEvent(QPaintEvent *e) {
 	QPainter(this).fillRect(e->rect(), st::dialogsBg);
 }
 
-} // namespace Dialogs
\ No newline at end of file
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index d3873d4f477aa..025b66cf8b34c 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -733,7 +733,6 @@ void MainWidget::hideSingleUseKeyboard(FullMsgId replyToId) {
 void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
 	auto tags = Data::SearchTagsFromQuery(query);
 	if (controller()->isPrimary()) {
-		using Tab = Dialogs::ChatSearchTab;
 		auto state = Dialogs::SearchState{
 			.inChat = ((tags.empty() || inChat.sublist())
 				? inChat

From 0e30e306ff9d4a0ae2cde7381e994c058ec4db34 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 21 May 2024 17:28:30 +0300
Subject: [PATCH 229/400] Added second type of stars to animation of mini
 stars.

---
 .../SourceFiles/ui/effects/premium_stars.cpp    | 17 ++++++++++++++---
 Telegram/SourceFiles/ui/effects/premium_stars.h | 13 ++++++++++++-
 .../ui/effects/premium_stars_colored.cpp        |  6 ++++--
 .../ui/effects/premium_stars_colored.h          |  5 ++++-
 .../SourceFiles/ui/effects/premium_top_bar.cpp  |  2 +-
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/ui/effects/premium_stars.cpp b/Telegram/SourceFiles/ui/effects/premium_stars.cpp
index f7b1b52574f4f..c63f700d76ad0 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_stars.cpp
@@ -17,7 +17,10 @@ namespace Premium {
 
 constexpr auto kDeformationMax = 0.1;
 
-MiniStars::MiniStars(Fn<void(const QRect &r)> updateCallback, bool opaque)
+MiniStars::MiniStars(
+	Fn<void(const QRect &r)> updateCallback,
+	bool opaque,
+	Type type)
 : _availableAngles({
 	Interval{ -10, 40 },
 	Interval{ 180 + 10 - 40, 40 },
@@ -29,6 +32,7 @@ MiniStars::MiniStars(Fn<void(const QRect &r)> updateCallback, bool opaque)
 , _size({ 5, 10 })
 , _alpha({ opaque ? 100 : 40, opaque ? 100 : 60 })
 , _sinFactor({ 10, 190 })
+, _spritesCount({ 0, ((type == Type::MonoStars) ? 1 : 2) })
 , _appearProgressTill(0.2)
 , _disappearProgressAfter(0.8)
 , _distanceProgressStart(0.5)
@@ -41,6 +45,10 @@ MiniStars::MiniStars(Fn<void(const QRect &r)> updateCallback, bool opaque)
 		updateCallback(base::take(_rectToUpdate));
 	}
 }) {
+	if (type == Type::BiStars) {
+		_secondSprite = std::make_unique<QSvgRenderer>(
+			u":/gui/icons/settings/star.svg"_q);
+	}
 	if (anim::Disabled()) {
 		const auto from = _deathTime.from + _deathTime.length;
 		auto r = bytes::vector(from + 1);
@@ -117,7 +125,7 @@ void MiniStars::paint(QPainter &p, const QRectF &rect) {
 				- starHeight / 2.,
 			starWidth,
 			starHeight);
-		_sprite.render(&p, renderRect);
+		ministar.sprite->render(&p, renderRect);
 		_rectToUpdate |= renderRect.toRect();
 	}
 	p.setOpacity(opacity);
@@ -128,7 +136,7 @@ void MiniStars::setPaused(bool paused) {
 }
 
 void MiniStars::createStar(crl::time now) {
-	constexpr auto kRandomSize = 8;
+	constexpr auto kRandomSize = 9;
 	auto random = bytes::vector(kRandomSize);
 	base::RandomFill(random.data(), random.size());
 
@@ -148,6 +156,9 @@ void MiniStars::createStar(crl::time now) {
 		.alpha = float64(randomInterval(_alpha, next())) / 100.,
 		.sinFactor = randomInterval(_sinFactor, next()) / 100.
 			* ((uchar(next()) % 2) == 1 ? 1. : -1.),
+		.sprite = ((randomInterval(_spritesCount, next()) && _secondSprite)
+			? _secondSprite.get()
+			: &_sprite),
 	};
 	for (auto i = 0; i < _ministars.size(); i++) {
 		if (ministar.birthTime > _ministars[i].deathTime) {
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars.h b/Telegram/SourceFiles/ui/effects/premium_stars.h
index 52feb589d99d1..d224d818601ee 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars.h
+++ b/Telegram/SourceFiles/ui/effects/premium_stars.h
@@ -16,7 +16,15 @@ namespace Premium {
 
 class MiniStars final {
 public:
-	MiniStars(Fn<void(const QRect &r)> updateCallback, bool opaque = false);
+	enum class Type {
+		MonoStars,
+		BiStars,
+	};
+
+	MiniStars(
+		Fn<void(const QRect &r)> updateCallback,
+		bool opaque = false,
+		Type type = Type::MonoStars);
 
 	void paint(QPainter &p, const QRectF &rect);
 	void setPaused(bool paused);
@@ -31,6 +39,7 @@ class MiniStars final {
 		float64 size = 0.;
 		float64 alpha = 0.;
 		float64 sinFactor = 0.;
+		not_null<QSvgRenderer*> sprite;
 	};
 
 	struct Interval {
@@ -50,12 +59,14 @@ class MiniStars final {
 	const Interval _size;
 	const Interval _alpha;
 	const Interval _sinFactor;
+	const Interval _spritesCount;
 
 	const float64 _appearProgressTill;
 	const float64 _disappearProgressAfter;
 	const float64 _distanceProgressStart;
 
 	QSvgRenderer _sprite;
+	std::unique_ptr<QSvgRenderer> _secondSprite;
 
 	Ui::Animations::Basic _animation;
 
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp b/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
index d5987a5e7ad8a..5e20cfd22f320 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
@@ -15,14 +15,16 @@ namespace Premium {
 
 ColoredMiniStars::ColoredMiniStars(
 	not_null<Ui::RpWidget*> parent,
-	bool optimizeUpdate)
+	bool optimizeUpdate,
+	MiniStars::Type type)
 : _ministars(
 	optimizeUpdate
 		? Fn<void(const QRect &)>([=](const QRect &r) {
 			parent->update(r.translated(_position));
 		})
 		: Fn<void(const QRect &)>([=](const QRect &) { parent->update(); }),
-	true) {
+	true,
+	type) {
 }
 
 void ColoredMiniStars::setSize(const QSize &size) {
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars_colored.h b/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
index 73001ada0b554..d0ae77b007c55 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
+++ b/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
@@ -17,7 +17,10 @@ namespace Premium {
 class ColoredMiniStars final {
 public:
 	// optimizeUpdate may cause paint glitch.
-	ColoredMiniStars(not_null<Ui::RpWidget*> parent, bool optimizeUpdate);
+	ColoredMiniStars(
+		not_null<Ui::RpWidget*> parent,
+		bool optimizeUpdate,
+		MiniStars::Type type = MiniStars::Type::MonoStars);
 
 	void setSize(const QSize &size);
 	void setPosition(QPoint position);
diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
index 999a077d464ed..640a96b3e9fd0 100644
--- a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
@@ -174,7 +174,7 @@ TopBar::TopBar(
 , _titleFont(st.titleFont)
 , _titlePadding(st.titlePadding)
 , _about(this, std::move(descriptor.about), st.about)
-, _ministars(this, descriptor.optimizeMinistars) {
+, _ministars(this, descriptor.optimizeMinistars, MiniStars::Type::BiStars) {
 	std::move(
 		descriptor.title
 	) | rpl::start_with_next([=](QString text) {

From 174fb62c325af9904e9f8a1463fe5eb2ee17a9ee Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 22 May 2024 00:49:35 +0300
Subject: [PATCH 230/400] Fixed purchases of credits.

---
 Telegram/SourceFiles/api/api_credits.cpp      | 55 +++----------------
 Telegram/SourceFiles/data/data_credits.h      |  1 +
 .../SourceFiles/payments/payments_form.cpp    | 12 +++-
 Telegram/SourceFiles/payments/payments_form.h |  1 +
 .../SourceFiles/settings/settings_credits.cpp |  1 +
 5 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 32497e2495aab..717adb64aae29 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -57,7 +57,7 @@ namespace {
 			status.data().vhistory().v
 		) | ranges::views::transform(HistoryFromTL) | ranges::to_vector,
 		.balance = status.data().vbalance().v,
-		.allLoaded = status.data().vnext_offset().has_value(),
+		.allLoaded = !status.data().vnext_offset().has_value(),
 		.token = qs(status.data().vnext_offset().value_or_empty()),
 	};
 }
@@ -85,6 +85,7 @@ rpl::producer<rpl::no_value, QString> CreditsTopupOptions::request() {
 						option.data().vstore_product().value_or_empty()),
 					.currency = qs(option.data().vcurrency()),
 					.amount = option.data().vamount().v,
+					.extended = option.data().is_extended(),
 				};
 			}) | ranges::to_vector;
 			consumer.put_done();
@@ -114,10 +115,6 @@ void CreditsStatus::request(
 		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input
 	)).done([=](const TLResult &result) {
 		_requestId = 0;
-#if _DEBUG
-		done({ .balance = uint64(base::RandomIndex(9999)) });
-		return;
-#endif
 		done(StatusFromTL(result, _peer));
 	}).fail([=] {
 		_requestId = 0;
@@ -127,9 +124,11 @@ void CreditsStatus::request(
 
 CreditsHistory::CreditsHistory(not_null<PeerData*> peer, bool in, bool out)
 : _peer(peer)
-, _flags(HistoryTL::Flags(0)
-	| (in ? HistoryTL::Flag::f_inbound : HistoryTL::Flags(0))
-	| (out ? HistoryTL::Flag::f_outbound : HistoryTL::Flags(0)))
+, _flags((in == out)
+	? HistoryTL::Flags(0)
+	: HistoryTL::Flags(0)
+		| (in ? HistoryTL::Flag::f_inbound : HistoryTL::Flags(0))
+		| (out ? HistoryTL::Flag::f_outbound : HistoryTL::Flags(0)))
 , _api(&peer->session().api().instance()) {
 }
 
@@ -145,46 +144,6 @@ void CreditsHistory::request(
 		MTP_string(token)
 	)).done([=](const MTPpayments_StarsStatus &result) {
 		_requestId = 0;
-#if _DEBUG
-		done({
-			.list = [&] {
-				auto a = std::vector<Data::CreditsHistoryEntry>();
-				const auto isIn = _flags & HistoryTL::Flag::f_inbound;
-				const auto isOut = _flags & HistoryTL::Flag::f_outbound;
-				for (auto i = 0; i < base::RandomIndex(10) + 1; i++) {
-					const auto type = (isIn && isOut)
-						? base::RandomIndex(4)
-						: isOut
-						? 0
-						: (base::RandomIndex(3) + 1);
-					a.push_back(Data::CreditsHistoryEntry{
-						.id = QString::number(base::RandomValue<uint64>()),
-						.credits = uint64(
-							std::max(base::RandomIndex(15000), 1)),
-						.date = base::unixtime::parse(
-							std::abs(base::RandomValue<TimeId>())),
-						.peerType = ((type == 0)
-							? Data::CreditsHistoryEntry::PeerType::Peer
-							: (type == 1)
-							? Data::CreditsHistoryEntry::PeerType::PlayMarket
-							: (type == 2)
-							? Data::CreditsHistoryEntry::PeerType::Fragment
-							: Data::CreditsHistoryEntry::PeerType::AppStore),
-						.peerId = (type == 0)
-							? peerFromUser(5000233800)
-							: PeerId(0),
-					});
-				}
-				return a;
-			}(),
-			.balance = 47890,
-			.allLoaded = !token.isEmpty(),
-			.token = token.isEmpty()
-				? QString::number(base::RandomValue<uint64>())
-				: QString(),
-		});
-		return;
-#endif
 		done(StatusFromTL(result, _peer));
 	}).fail([=] {
 		_requestId = 0;
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index cb0310c93924b..0984cf8bf4a25 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -14,6 +14,7 @@ struct CreditTopupOption final {
 	QString product;
 	QString currency;
 	uint64 amount = 0;
+	bool extended = false;
 };
 
 using CreditTopupOptions = std::vector<CreditTopupOption>;
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index c02ea408b7188..07a6b2a675acd 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -317,10 +317,16 @@ MTPInputInvoice Form::inputInvoice() const {
 	} else if (const auto slug = std::get_if<InvoiceSlug>(&_id.value)) {
 		return MTP_inputInvoiceSlug(MTP_string(slug->slug));
 	} else if (const auto credits = std::get_if<InvoiceCredits>(&_id.value)) {
+		using Flag = MTPDstarsTopupOption::Flag;
+		const auto emptyFlag = MTPDstarsTopupOption::Flags(0);
 		return MTP_inputInvoiceStars(MTP_starsTopupOption(
-			credits->product.isEmpty()
-				? MTP_flags(0)
-				: MTP_flags(MTPDstarsTopupOption::Flag::f_store_product),
+			MTP_flags(emptyFlag
+				| (credits->product.isEmpty()
+					? Flag::f_store_product
+					: emptyFlag)
+				| (credits->extended
+					? Flag::f_extended
+					: emptyFlag)),
 			MTP_long(credits->credits),
 			MTP_string(credits->product),
 			MTP_string(credits->currency),
diff --git a/Telegram/SourceFiles/payments/payments_form.h b/Telegram/SourceFiles/payments/payments_form.h
index 92448feb6dc24..8341131159d0f 100644
--- a/Telegram/SourceFiles/payments/payments_form.h
+++ b/Telegram/SourceFiles/payments/payments_form.h
@@ -223,6 +223,7 @@ struct InvoiceCredits {
 	QString product;
 	QString currency;
 	uint64 amount = 0;
+	bool extended = false;
 };
 
 struct InvoiceId {
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index a31c68e10c142..71ea3a9e10e41 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -297,6 +297,7 @@ void Credits::setupOptions(not_null<Ui::VerticalLayout*> container) {
 					.product = option.product,
 					.currency = option.currency,
 					.amount = option.amount,
+					.extended = option.extended,
 				};
 
 				const auto weak = Ui::MakeWeak(button);

From e11755af46d12a53b344804be78d1fb5e0b39b02 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 22 May 2024 17:01:42 +0300
Subject: [PATCH 231/400] Added credits balance to main session.

---
 Telegram/SourceFiles/api/api_updates.cpp           |  5 +++++
 Telegram/SourceFiles/main/main_session.cpp         |  8 ++++++++
 Telegram/SourceFiles/main/main_session.h           |  4 ++++
 Telegram/SourceFiles/settings/settings_credits.cpp | 10 +++++++---
 Telegram/SourceFiles/settings/settings_main.cpp    | 13 ++++++++++++-
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 56f8a8da4cc0b..0ebf17f334128 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -2614,6 +2614,11 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		_session->data().stories().apply(data.vstealth_mode());
 	} break;
 
+	case mtpc_updateStarsBalance: {
+		const auto &data = update.c_updateStarsBalance();
+		_session->setCredits(data.vbalance().v);
+	} break;
+
 	}
 }
 
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index aa70700ece1ec..fc8435d667db6 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -280,6 +280,14 @@ bool Session::premiumCanBuy() const {
 	return _premiumPossible.current();
 }
 
+rpl::producer<uint64> Session::creditsValue() const {
+	return _credits.value();
+}
+
+void Session::setCredits(uint64 credits) {
+	_credits = credits;
+}
+
 bool Session::isTestMode() const {
 	return mtp().isTestMode();
 }
diff --git a/Telegram/SourceFiles/main/main_session.h b/Telegram/SourceFiles/main/main_session.h
index 8d1b276ecb1fe..85aa2fe0868f4 100644
--- a/Telegram/SourceFiles/main/main_session.h
+++ b/Telegram/SourceFiles/main/main_session.h
@@ -100,6 +100,9 @@ class Session final : public base::has_weak_ptr {
 	[[nodiscard]] bool premiumBadgesShown() const;
 	[[nodiscard]] bool premiumCanBuy() const;
 
+	[[nodiscard]] rpl::producer<uint64> creditsValue() const;
+	void setCredits(uint64 credits);
+
 	[[nodiscard]] bool isTestMode() const;
 	[[nodiscard]] uint64 uniqueId() const; // userId() with TestDC shift.
 	[[nodiscard]] UserId userId() const;
@@ -258,6 +261,7 @@ class Session final : public base::has_weak_ptr {
 	const std::unique_ptr<Support::Helper> _supportHelper;
 
 	std::shared_ptr<QImage> _selfUserpicView;
+	rpl::variable<uint64> _credits = 0;
 	rpl::variable<bool> _premiumPossible = false;
 
 	rpl::event_stream<bool> _termsLockChanges;
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 71ea3a9e10e41..67f9e2a3ebb29 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -578,12 +578,16 @@ QPointer<Ui::RpWidget> Credits::createPinnedToTop(
 						+ diffBetweenStarAndCount),
 				label->style()->font->height + starSize.height());
 		};
-		api->request({}, [=](Data::CreditsStatusSlice slice) {
+		_controller->session().creditsValue(
+		) | rpl::start_with_next([=](uint64 value) {
 			count->setText(
 				st::semiboldTextStyle,
-				Lang::FormatCountToShort(slice.balance).string);
-			balance->setBalance(slice.balance);
+				Lang::FormatCountToShort(value).string);
+			balance->setBalance(value);
 			resize();
+		}, balance->lifetime());
+		api->request({}, [=](Data::CreditsStatusSlice slice) {
+			_controller->session().setCredits(slice.balance);
 		});
 		balance->paintRequest(
 		) | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 332677a93b12d..9f2e73072b24c 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "settings/settings_main.h"
 
+#include "api/api_credits.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
 #include "settings/settings_advanced.h"
@@ -491,9 +492,13 @@ void SetupPremium(
 		showOther(PremiumId());
 	});
 	AddPremiumStar(
-		AddButtonWithIcon(
+		AddButtonWithLabel(
 			container,
 			tr::lng_credits_summary_title(),
+			controller->session().creditsValue(
+			) | rpl::map([=](uint64 c) {
+				return c ? Lang::FormatCountToShort(c).string : QString{};
+			}),
 			st::settingsButton),
 		true
 	)->addClickHandler([=] {
@@ -510,6 +515,12 @@ void SetupPremium(
 	});
 	Ui::NewBadge::AddToRight(button);
 
+	const auto api = button->lifetime().make_state<Api::CreditsStatus>(
+		controller->session().user());
+	api->request({}, [=](Data::CreditsStatusSlice slice) {
+		controller->session().setCredits(slice.balance);
+	});
+
 	if (controller->session().premiumCanBuy()) {
 		const auto button = AddButtonWithIcon(
 			container,

From 5ca9b74142e2c5519b0c9458b0bdb3df6d9d535a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 22 May 2024 18:40:15 +0300
Subject: [PATCH 232/400] Fixed effect for successful payments in credits
 settings.

---
 Telegram/SourceFiles/settings/settings_credits.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 67f9e2a3ebb29..1793d07ace204 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -178,6 +178,8 @@ class Credits : public Section<Credits> {
 
 	const not_null<Window::SessionController*> _controller;
 
+	QWidget *_parent = nullptr;
+
 	QImage _star;
 	QImage _balanceStar;
 
@@ -305,7 +307,9 @@ void Credits::setupOptions(not_null<Ui::VerticalLayout*> container) {
 					if (const auto strong = weak.data()) {
 						strong->window()->setFocus();
 						if (result == Payments::CheckoutResult::Paid) {
-							Ui::StartFireworks(this);
+							if (_parent) {
+								Ui::StartFireworks(_parent);
+							}
 						}
 					}
 				};
@@ -513,6 +517,7 @@ void Credits::setupContent() {
 
 QPointer<Ui::RpWidget> Credits::createPinnedToTop(
 		not_null<QWidget*> parent) {
+	_parent = parent;
 
 	const auto content = [&]() -> Ui::Premium::TopBarAbstract* {
 		const auto weak = base::make_weak(_controller);

From 69c48e2b5b8ad096e238ad473c66306e752004ca Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 22 May 2024 21:47:36 +0300
Subject: [PATCH 233/400] Moved out credits balance widget to single place.

---
 .../SourceFiles/settings/settings_credits.cpp | 116 ++++++++++--------
 .../SourceFiles/settings/settings_credits.h   |  28 +----
 2 files changed, 70 insertions(+), 74 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 1793d07ace204..a1fde01f49f92 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -562,63 +562,16 @@ QPointer<Ui::RpWidget> Credits::createPinnedToTop(
 		}
 	}, content->lifetime());
 
-	const auto balance = Ui::CreateChild<Balance>(content);
 	{
-		const auto starSize = _balanceStar.size() / style::DevicePixelRatio();
-		const auto label = balance->lifetime().make_state<Ui::Text::String>(
-			st::defaultTextStyle,
-			tr::lng_credits_summary_balance(tr::now));
-		const auto count = balance->lifetime().make_state<Ui::Text::String>(
-			st::semiboldTextStyle,
-			tr::lng_contacts_loading(tr::now));
+		const auto balance = AddBalanceWidget(
+			content,
+			_controller->session().creditsValue(),
+			true);
 		const auto api = balance->lifetime().make_state<Api::CreditsStatus>(
 			_controller->session().user());
-		const auto diffBetweenStarAndCount = count->style()->font->spacew;
-		const auto resize = [=] {
-			balance->resize(
-				std::max(
-					label->maxWidth(),
-					count->maxWidth()
-						+ starSize.width()
-						+ diffBetweenStarAndCount),
-				label->style()->font->height + starSize.height());
-		};
-		_controller->session().creditsValue(
-		) | rpl::start_with_next([=](uint64 value) {
-			count->setText(
-				st::semiboldTextStyle,
-				Lang::FormatCountToShort(value).string);
-			balance->setBalance(value);
-			resize();
-		}, balance->lifetime());
 		api->request({}, [=](Data::CreditsStatusSlice slice) {
 			_controller->session().setCredits(slice.balance);
 		});
-		balance->paintRequest(
-		) | rpl::start_with_next([=] {
-			auto p = QPainter(balance);
-
-			p.setPen(st::boxTextFg);
-
-			label->draw(p, {
-				.position = QPoint(balance->width() - label->maxWidth(), 0),
-				.availableWidth = balance->width(),
-			});
-			count->draw(p, {
-				.position = QPoint(
-					balance->width() - count->maxWidth(),
-					label->minHeight()
-						+ (starSize.height() - count->minHeight()) / 2),
-				.availableWidth = balance->width(),
-			});
-			p.drawImage(
-				balance->width()
-					- count->maxWidth()
-					- starSize.width()
-					- diffBetweenStarAndCount,
-				label->minHeight(),
-				_balanceStar);
-		}, balance->lifetime());
 		rpl::combine(
 			balance->sizeValue(),
 			content->sizeValue()
@@ -706,4 +659,65 @@ Type CreditsId() {
 	return Credits::Id();
 }
 
+not_null<Ui::RpWidget*> AddBalanceWidget(
+		not_null<Ui::RpWidget*> parent,
+		rpl::producer<uint64> balanceValue,
+		bool rightAlign) {
+	const auto balance = Ui::CreateChild<Balance>(parent);
+	const auto balanceStar = balance->lifetime().make_state<QImage>(
+		GenerateStars(st::creditsBalanceStarHeight, 1));
+	const auto starSize = balanceStar->size() / style::DevicePixelRatio();
+	const auto label = balance->lifetime().make_state<Ui::Text::String>(
+		st::defaultTextStyle,
+		tr::lng_credits_summary_balance(tr::now));
+	const auto count = balance->lifetime().make_state<Ui::Text::String>(
+		st::semiboldTextStyle,
+		tr::lng_contacts_loading(tr::now));
+	const auto diffBetweenStarAndCount = count->style()->font->spacew;
+	const auto resize = [=] {
+		balance->resize(
+			std::max(
+				label->maxWidth(),
+				count->maxWidth()
+					+ starSize.width()
+					+ diffBetweenStarAndCount),
+			label->style()->font->height + starSize.height());
+	};
+	std::move(balanceValue) | rpl::start_with_next([=](uint64 value) {
+		count->setText(
+			st::semiboldTextStyle,
+			Lang::FormatCountToShort(value).string);
+		balance->setBalance(value);
+		resize();
+	}, balance->lifetime());
+	balance->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(balance);
+
+		p.setPen(st::boxTextFg);
+
+		label->draw(p, {
+			.position = QPoint(
+				rightAlign ? (balance->width() - label->maxWidth()) : 0,
+				0),
+			.availableWidth = balance->width(),
+		});
+		count->draw(p, {
+			.position = QPoint(
+				balance->width() - count->maxWidth(),
+				label->minHeight()
+					+ (starSize.height() - count->minHeight()) / 2),
+			.availableWidth = balance->width(),
+		});
+		p.drawImage(
+			balance->width()
+				- count->maxWidth()
+				- starSize.width()
+				- diffBetweenStarAndCount,
+			label->minHeight(),
+			*balanceStar);
+	}, balance->lifetime());
+	return balance;
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_credits.h b/Telegram/SourceFiles/settings/settings_credits.h
index 7484fa6373e7d..2267a0cd56a44 100644
--- a/Telegram/SourceFiles/settings/settings_credits.h
+++ b/Telegram/SourceFiles/settings/settings_credits.h
@@ -9,36 +9,18 @@ For license and copyright information please follow this link:
 
 #include "settings/settings_type.h"
 
-enum class PremiumFeature;
-
-namespace style {
-struct RoundButton;
-} // namespace style
-
-namespace ChatHelpers {
-class Show;
-enum class WindowUsage;
-} // namespace ChatHelpers
-
 namespace Ui {
 class RpWidget;
-class RoundButton;
-class GradientButton;
-class VerticalLayout;
 } // namespace Ui
 
-namespace Main {
-class Session;
-class SessionShow;
-} // namespace Main
-
-namespace Window {
-class SessionController;
-} // namespace Window
-
 namespace Settings {
 
 [[nodiscard]] Type CreditsId();
 
+[[nodiscard]] not_null<Ui::RpWidget*> AddBalanceWidget(
+	not_null<Ui::RpWidget*> parent,
+	rpl::producer<uint64> balanceValue,
+	bool rightAlign);
+
 } // namespace Settings
 

From 3d81414c71161ede9eefc44af81ec54282834899 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 22 May 2024 21:48:11 +0300
Subject: [PATCH 234/400] Added initial implementation of box for sending
 credits.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../SourceFiles/boxes/send_credits_box.cpp    | 263 ++++++++++++++++++
 Telegram/SourceFiles/boxes/send_credits_box.h |  22 ++
 Telegram/SourceFiles/ui/effects/credits.style |   5 +
 4 files changed, 292 insertions(+)
 create mode 100644 Telegram/SourceFiles/boxes/send_credits_box.cpp
 create mode 100644 Telegram/SourceFiles/boxes/send_credits_box.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index b1b39f59f96d3..8d1d2369d298a 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -301,6 +301,8 @@ PRIVATE
     boxes/ringtones_box.h
     boxes/self_destruction_box.cpp
     boxes/self_destruction_box.h
+    boxes/send_credits_box.cpp
+    boxes/send_credits_box.h
     boxes/send_files_box.cpp
     boxes/send_files_box.h
     boxes/sessions_box.cpp
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
new file mode 100644
index 0000000000000..ae45850bd46cb
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -0,0 +1,263 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/send_credits_box.h"
+
+#include "api/api_credits.h"
+#include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "data/data_credits.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo_media.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "payments/payments_form.h"
+#include "settings/settings_credits.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/effects/premium_top_bar.h" // Ui::Premium::ColorizedSvg.
+#include "ui/image/image_prepare.h"
+#include "ui/layers/generic_box.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "styles/style_boxes.h"
+#include "styles/style_credits.h"
+#include "styles/style_giveaway.h"
+#include "styles/style_layers.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+
+namespace Ui {
+namespace {
+} // namespace
+
+void SendCreditsBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<HistoryItem*> item) {
+	const auto media = item->media();
+	const auto invoice = media ? media->invoice() : nullptr;
+	if (!invoice) {
+		return;
+	}
+	box->setStyle(st::giveawayGiftCodeBox);
+	box->setNoContentMargin(true);
+
+	const auto session = &item->history()->owner().session();
+
+	const auto photoSize = st::defaultUserpicButton.photoSize;
+
+	const auto content = box->verticalLayout();
+	Ui::AddSkip(content, photoSize / 2);
+
+	{
+		const auto ministarsContainer = Ui::CreateChild<Ui::RpWidget>(box);
+		const auto fullHeight = photoSize * 2;
+		using MiniStars = Ui::Premium::ColoredMiniStars;
+		const auto ministars = box->lifetime().make_state<MiniStars>(
+			ministarsContainer,
+			false,
+			Ui::Premium::MiniStars::Type::BiStars);
+		ministars->setColorOverride(Ui::Premium::CreditsIconGradientStops());
+
+		ministarsContainer->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = QPainter(ministarsContainer);
+			ministars->paint(p);
+		}, ministarsContainer->lifetime());
+
+		box->widthValue(
+		) | rpl::start_with_next([=](int width) {
+			ministarsContainer->resize(width, fullHeight);
+			const auto w = fullHeight / 3 * 2;
+			ministars->setCenter(QRect(
+				(width - w) / 2,
+				(fullHeight - w) / 2,
+				w,
+				w));
+		}, ministarsContainer->lifetime());
+	}
+
+	if (false && invoice->photo) {
+		struct State {
+			std::shared_ptr<Data::PhotoMedia> view;
+			Image *image = nullptr;
+			rpl::lifetime downloadLifetime;
+		};
+		const auto state = content->lifetime().make_state<State>();
+		const auto widget = box->addRow(
+			object_ptr<Ui::CenterWrap<>>(
+				content,
+				object_ptr<Ui::RpWidget>(content)))->entity();
+		state->view = invoice->photo->createMediaView();
+		state->view->wanted(Data::PhotoSize::Large, item->fullId());
+
+		widget->resize(Size(photoSize));
+
+		rpl::single(rpl::empty_value()) | rpl::then(
+			session->downloaderTaskFinished()
+		) | rpl::start_with_next([=] {
+			using Size = Data::PhotoSize;
+			if (const auto large = state->view->image(Size::Large)) {
+				state->image = large;
+			} else if (const auto small = state->view->image(Size::Small)) {
+				state->image = small;
+			} else if (const auto t = state->view->image(Size::Thumbnail)) {
+				state->image = t;
+			}
+			widget->update();
+			if (state->view->loaded()) {
+				state->downloadLifetime.destroy();
+			}
+		}, state->downloadLifetime);
+
+		widget->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = QPainter(widget);
+			if (state->image) {
+				p.drawPixmap(0, 0, state->image->pix(widget->width(), {
+					.options = Images::Option::RoundCircle,
+				}));
+			}
+		}, widget->lifetime());
+	} else {
+		const auto widget = box->addRow(
+			object_ptr<Ui::CenterWrap<>>(
+				content,
+				object_ptr<Ui::UserpicButton>(
+					content,
+					item->author(),
+					st::defaultUserpicButton)));
+		widget->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+
+	const auto asd = box->lifetime().make_state<uint64>();
+
+	Ui::AddSkip(content);
+	box->addRow(object_ptr<Ui::CenterWrap<>>(
+		box,
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_credits_box_out_title(),
+			st::settingsPremiumUserTitle)));
+	Ui::AddSkip(content);
+	box->addRow(object_ptr<Ui::CenterWrap<>>(
+		box,
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_credits_box_out_sure(
+				lt_count,
+				rpl::single(invoice->amount) | tr::to_count(),
+				lt_text,
+				rpl::single(TextWithEntities{ invoice->title }),
+				lt_bot,
+				rpl::single(TextWithEntities{ item->author()->name() }),
+				Ui::Text::RichLangValue),
+			st::creditsBoxAbout)));
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	const auto button = box->addButton(rpl::single(QString()), [=] {
+	});
+	{
+		const auto emojiMargin = QMargins(
+			0,
+			-st::moderateBoxExpandInnerSkip,
+			0,
+			0);
+		const auto buttonEmoji = Ui::Text::SingleCustomEmoji(
+			session->data().customEmojiManager().registerInternalEmoji(
+				st::settingsPremiumIconStar,
+				emojiMargin,
+				true));
+		auto buttonText = tr::lng_credits_box_out_confirm(
+			lt_count,
+			rpl::single(invoice->amount) | tr::to_count(),
+			lt_emoji,
+			rpl::single(buttonEmoji),
+			Ui::Text::RichLangValue);
+		const auto buttonLabel = Ui::CreateChild<Ui::FlatLabel>(
+			button,
+			rpl::single(QString()),
+			st::defaultFlatLabel);
+		std::move(
+			buttonText
+		) | rpl::start_with_next([=](const TextWithEntities &text) {
+			buttonLabel->setMarkedText(
+				text,
+				Core::MarkedTextContext{
+					.session = session,
+					.customEmojiRepaint = [=] { buttonLabel->update(); },
+				});
+		}, buttonLabel->lifetime());
+		buttonLabel->setTextColorOverride(
+			box->getDelegate()->style().button.textFg->c);
+		button->sizeValue(
+		) | rpl::start_with_next([=](const QSize &size) {
+			buttonLabel->moveToLeft(
+				(size.width() - buttonLabel->width()) / 2,
+				(size.height() - buttonLabel->height()) / 2);
+		}, buttonLabel->lifetime());
+		buttonLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+
+	const auto buttonWidth = st::boxWidth
+		- 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 close = Ui::CreateChild<Ui::IconButton>(
+			box.get(),
+			st::boxTitleClose);
+		close->setClickedCallback([=] {
+			box->closeBox();
+		});
+		box->widthValue(
+		) | rpl::start_with_next([=](int width) {
+			close->moveToRight(0, 0);
+			close->raise();
+		}, close->lifetime());
+	}
+
+	{
+		const auto balance = Settings::AddBalanceWidget(
+			content,
+			session->creditsValue(),
+			false);
+		const auto api = balance->lifetime().make_state<Api::CreditsStatus>(
+			session->user());
+		api->request({}, [=](Data::CreditsStatusSlice slice) {
+			session->setCredits(slice.balance);
+		});
+		rpl::combine(
+			balance->sizeValue(),
+			content->sizeValue()
+		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+			balance->moveToLeft(
+				st::creditsHistoryRightSkip * 2,
+				st::creditsHistoryRightSkip);
+			balance->update();
+		}, balance->lifetime());
+	}
+}
+
+bool IsCreditsInvoice(not_null<HistoryItem*> item) {
+	const auto media = item->media();
+	const auto invoice = media ? media->invoice() : nullptr;
+	return invoice && (invoice->currency == "XTR");
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.h b/Telegram/SourceFiles/boxes/send_credits_box.h
new file mode 100644
index 0000000000000..fa877e305fac8
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/send_credits_box.h
@@ -0,0 +1,22 @@
+/*
+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 HistoryItem;
+
+namespace Ui {
+
+class GenericBox;
+
+void SendCreditsBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<HistoryItem*> item);
+
+[[nodiscard]] bool IsCreditsInvoice(not_null<HistoryItem*> item);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 8a1afec1961e2..19c73c7ba29c1 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -25,3 +25,8 @@ creditsTopupPrice: FlatLabel(defaultFlatLabel) {
 
 creditsHistoryRightSkip: 10px;
 creditsBalanceStarHeight: 20px;
+
+creditsBoxAbout: FlatLabel(defaultFlatLabel) {
+	minWidth: 256px;
+	align: align(top);
+}

From 84cde1354db20bed7e5a78dca2ef35e60091640c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 22 May 2024 21:48:57 +0300
Subject: [PATCH 235/400] Slightly improved invoice view in messages for
 credits.

---
 Telegram/SourceFiles/api/api_bot.cpp            | 17 +++++++++++------
 .../history/view/media/history_view_invoice.cpp |  7 ++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index 0284ae719d1b2..befdc04e55c54 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "api/api_cloud_password.h"
 #include "api/api_send_progress.h"
+#include "boxes/send_credits_box.h"
 #include "boxes/share_box.h"
 #include "boxes/passcode_box.h"
 #include "boxes/url_auth_box.h"
@@ -330,12 +331,16 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 	} break;
 
 	case ButtonType::Buy: {
-		Payments::CheckoutProcess::Start(
-			item,
-			Payments::Mode::Payment,
-			crl::guard(controller, [=](auto) {
-				controller->widget()->activate();
-			}));
+		if (Ui::IsCreditsInvoice(item)) {
+			controller->uiShow()->show(Box(Ui::SendCreditsBox, item));
+		} else {
+			Payments::CheckoutProcess::Start(
+				item,
+				Payments::Mode::Payment,
+				crl::guard(controller, [=](auto) {
+					controller->widget()->activate();
+				}));
+		}
 	} break;
 
 	case ButtonType::Url: {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
index 95676cc89b4c4..65987e6bb09b5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "history/view/media/history_view_invoice.h"
 
+#include "boxes/send_credits_box.h" // IsCreditsInvoice.
 #include "lang/lang_keys.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
@@ -34,7 +35,8 @@ Invoice::Invoice(
 }
 
 void Invoice::fillFromData(not_null<Data::Invoice*> invoice) {
-	if (invoice->photo) {
+	const auto isCreditsCurrency = Ui::IsCreditsInvoice(_parent->data());
+	if (invoice->photo && !isCreditsCurrency) {
 		const auto spoiler = false;
 		_attach = std::make_unique<Photo>(
 			_parent,
@@ -64,6 +66,9 @@ void Invoice::fillFromData(not_null<Data::Invoice*> invoice) {
 		0,
 		int(statusText.text.size()) });
 	statusText.text += ' ' + labelText().toUpper();
+	if (isCreditsCurrency) {
+		statusText = {};
+	}
 	_status.setMarkedText(
 		st::defaultTextStyle,
 		statusText,

From dcc52a7333cc4fcd0650983d43e642f2d477c57f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 23 May 2024 17:05:58 +0300
Subject: [PATCH 236/400] Moved out painting of userpic for credits entries to
 single place.

---
 .../info_statistics_list_controllers.cpp      | 51 +++++------------
 .../ui/effects/credits_graphics.cpp           | 55 +++++++++++++++++++
 .../SourceFiles/ui/effects/credits_graphics.h | 19 +++++++
 Telegram/cmake/td_ui.cmake                    |  2 +
 4 files changed, 90 insertions(+), 37 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/effects/credits_graphics.cpp
 create mode 100644 Telegram/SourceFiles/ui/effects/credits_graphics.h

diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 285a0e1a805ea..24c37d4e1f03e 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -19,6 +19,7 @@ For license and copyright information please follow this link:
 #include "info/channel_statistics/boosts/giveaway/boost_badge.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "ui/effects/credits_graphics.h"
 #include "ui/effects/outline_segments.h" // Ui::UnreadStoryOutlineGradient.
 #include "ui/effects/toggle_arrow.h"
 #include "ui/painter.h"
@@ -30,7 +31,6 @@ For license and copyright information please follow this link:
 #include "ui/wrap/vertical_layout.h"
 #include "styles/style_credits.h"
 #include "styles/style_dialogs.h" // dialogsStoriesFull.
-#include "styles/style_intro.h" // introFragmentIcon.
 #include "styles/style_layers.h" // boxRowPadding.
 #include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
@@ -740,7 +740,8 @@ class CreditsRow final : public PeerListRow {
 	const Data::CreditsHistoryEntry _entry;
 	not_null<QImage*> const _creditIcon;
 	const int _rowHeight;
-	Ui::EmptyUserpic _userpic;
+
+	PaintRoundImageCallback _paintUserpicCallback;
 
 	Ui::Text::String _rightText;
 };
@@ -749,8 +750,7 @@ CreditsRow::CreditsRow(not_null<PeerData*> peer, const Descriptor &descriptor)
 : PeerListRow(peer, UniqueRowIdFromString(descriptor.entry.id))
 , _entry(descriptor.entry)
 , _creditIcon(descriptor.creditIcon)
-, _rowHeight(descriptor.rowHeight)
-, _userpic(Ui::EmptyUserpic::UserpicColor(0), QString()) {
+, _rowHeight(descriptor.rowHeight) {
 	init();
 }
 
@@ -758,22 +758,7 @@ CreditsRow::CreditsRow(const Descriptor &descriptor)
 : PeerListRow(UniqueRowIdFromString(descriptor.entry.id))
 , _entry(descriptor.entry)
 , _creditIcon(descriptor.creditIcon)
-, _rowHeight(descriptor.rowHeight)
-, _userpic(
-	[&]() -> Ui::EmptyUserpic::BgColors {
-		switch (descriptor.entry.peerType) {
-		case Data::CreditsHistoryEntry::PeerType::Peer:
-			return Ui::EmptyUserpic::UserpicColor(0);
-		case Data::CreditsHistoryEntry::PeerType::AppStore:
-			return { st::historyPeer7UserpicBg, st::historyPeer7UserpicBg2 };
-		case Data::CreditsHistoryEntry::PeerType::PlayMarket:
-			return { st::historyPeer2UserpicBg, st::historyPeer2UserpicBg2 };
-		case Data::CreditsHistoryEntry::PeerType::Fragment:
-			return { st::historyPeer8UserpicBg, st::historyPeer8UserpicBg2 };
-		}
-		Unexpected("Unknown peer type.");
-	}(),
-	QString()) {
+, _rowHeight(descriptor.rowHeight) {
 	init();
 }
 
@@ -786,6 +771,9 @@ void CreditsRow::init() {
 			(PeerListRow::special() ? QChar('+') : kMinus)
 				+ Lang::FormatCountDecimal(_entry.credits));
 	}
+	_paintUserpicCallback = !PeerListRow::special()
+		? PeerListRow::generatePaintUserpicCallback(false)
+		: Ui::GenerateCreditsPaintUserpicCallback(_entry);
 }
 
 const Data::CreditsHistoryEntry &CreditsRow::entry() const {
@@ -801,27 +789,16 @@ QString CreditsRow::generateName() {
 }
 
 PaintRoundImageCallback CreditsRow::generatePaintUserpicCallback(bool force) {
-	if (!PeerListRow::special()) {
-		return PeerListRow::generatePaintUserpicCallback(force);
-	}
-	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
-		_userpic.paintCircle(p, x, y, outerWidth, size);
-		using PeerType = Data::CreditsHistoryEntry::PeerType;
-		((_entry.peerType == PeerType::AppStore)
-			? st::sessionIconiPhone
-			: (_entry.peerType == PeerType::PlayMarket)
-			? st::sessionIconAndroid
-			: st::introFragmentIcon).paintInCenter(p, { x, y, size, size });
-	};
+	return _paintUserpicCallback;
 }
 
 QSize CreditsRow::rightActionSize() const {
 	return QSize(
-			_rightText.maxWidth()
-				+ (_creditIcon->width() / style::DevicePixelRatio())
-				+ st::creditsHistoryRightSkip
-				+ _rightText.style()->font->spacew * 2,
-			_rowHeight);
+		_rightText.maxWidth()
+			+ (_creditIcon->width() / style::DevicePixelRatio())
+			+ st::creditsHistoryRightSkip
+			+ _rightText.style()->font->spacew * 2,
+		_rowHeight);
 }
 
 QMargins CreditsRow::rightActionMargins() const {
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
new file mode 100644
index 0000000000000..555ee44c0d643
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
@@ -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
+*/
+#include "ui/effects/credits_graphics.h"
+
+#include <QtCore/QDateTime>
+
+#include "data/data_credits.h"
+#include "ui/empty_userpic.h"
+#include "ui/painter.h"
+#include "styles/style_credits.h"
+#include "styles/style_intro.h" // introFragmentIcon.
+#include "styles/style_settings.h"
+
+namespace Ui {
+
+using PaintRoundImageCallback = Fn<void(
+	Painter &p,
+	int x,
+	int y,
+	int outerWidth,
+	int size)>;
+
+PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
+		const Data::CreditsHistoryEntry &entry) {
+	const auto bg = [&]() -> Ui::EmptyUserpic::BgColors {
+		switch (entry.peerType) {
+		case Data::CreditsHistoryEntry::PeerType::Peer:
+			return Ui::EmptyUserpic::UserpicColor(0);
+		case Data::CreditsHistoryEntry::PeerType::AppStore:
+			return { st::historyPeer7UserpicBg, st::historyPeer7UserpicBg2 };
+		case Data::CreditsHistoryEntry::PeerType::PlayMarket:
+			return { st::historyPeer2UserpicBg, st::historyPeer2UserpicBg2 };
+		case Data::CreditsHistoryEntry::PeerType::Fragment:
+			return { st::historyPeer8UserpicBg, st::historyPeer8UserpicBg2 };
+		}
+		Unexpected("Unknown peer type.");
+	}();
+	const auto userpic = std::make_shared<Ui::EmptyUserpic>(bg, QString());
+	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
+		userpic->paintCircle(p, x, y, outerWidth, size);
+		using PeerType = Data::CreditsHistoryEntry::PeerType;
+		((entry.peerType == PeerType::AppStore)
+			? st::sessionIconiPhone
+			: (entry.peerType == PeerType::PlayMarket)
+			? st::sessionIconAndroid
+			: st::introFragmentIcon).paintInCenter(p, { x, y, size, size });
+	};
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.h b/Telegram/SourceFiles/ui/effects/credits_graphics.h
new file mode 100644
index 0000000000000..c7d8584df8356
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.h
@@ -0,0 +1,19 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+struct CreditsHistoryEntry;
+} // namespace Data
+
+namespace Ui {
+
+Fn<void(Painter &, int, int, int, int)> GenerateCreditsPaintUserpicCallback(
+	const Data::CreditsHistoryEntry &entry);
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 8c8cddac41833..0a97c6b6d8360 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -356,6 +356,8 @@ PRIVATE
     ui/effects/fireworks_animation.h
     ui/effects/glare.cpp
     ui/effects/glare.h
+    ui/effects/credits_graphics.cpp
+    ui/effects/credits_graphics.h
     ui/effects/loading_element.cpp
     ui/effects/loading_element.h
     ui/effects/outline_segments.cpp

From 43cb315f477d0f265e3fa10305c615c57565d01e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 23 May 2024 17:55:33 +0300
Subject: [PATCH 237/400] Replaced PeerId with BareId in credits history
 entries.

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

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 717adb64aae29..61ce79870f745 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -39,11 +39,11 @@ namespace {
 		}, [](const MTPDstarsTransactionPeerPremiumBot &) {
 			return Data::CreditsHistoryEntry::PeerType::PremiumBot;
 		}),
-		.peerId = tl.data().vpeer().match([](const HistoryPeerTL &p) {
+		.bareId = tl.data().vpeer().match([](const HistoryPeerTL &p) {
 			return peerFromMTP(p.vpeer());
 		}, [](const auto &) {
 			return PeerId(0);
-		}),
+		}).value,
 	};
 }
 
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 0984cf8bf4a25..7a241c87a9a00 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -32,7 +32,7 @@ struct CreditsHistoryEntry final {
 	uint64 credits = 0;
 	QDateTime date;
 	PeerType peerType;
-	PeerId peerId = PeerId(0);
+	uint64 bareId = 0;
 };
 
 struct CreditsStatusSlice final {
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 24c37d4e1f03e..5a7c7e1bc4c92 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -908,8 +908,8 @@ void CreditsController::applySlice(const Data::CreditsStatusSlice &slice) {
 				.creditIcon = _creditIcon,
 				.rowHeight = computeListSt().item.height,
 			};
-			if (item.peerId) {
-				const auto peer = session().data().peer(item.peerId);
+			if (item.bareId) {
+				const auto peer = session().data().peer(PeerId(item.bareId));
 				return std::make_unique<CreditsRow>(peer, descriptor);
 			} else {
 				return std::make_unique<CreditsRow>(descriptor);

From d1e914fb309f23299e8f404de18b83d82292ee6b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 23 May 2024 21:44:50 +0300
Subject: [PATCH 238/400] Added initial implementation of box for credits
 history entries.

---
 Telegram/Resources/langs/lang.strings         |   5 +
 .../SourceFiles/boxes/gift_premium_box.cpp    |  48 +++++++
 Telegram/SourceFiles/boxes/gift_premium_box.h |   7 ++
 .../boosts/giveaway/giveaway.style            |   4 +
 .../info_statistics_list_controllers.cpp      |   4 +-
 .../SourceFiles/settings/settings_credits.cpp | 118 ++++++++++++++++++
 Telegram/SourceFiles/ui/effects/credits.style |   4 +
 .../ui/effects/credits_graphics.cpp           |   9 ++
 .../SourceFiles/ui/effects/credits_graphics.h |   3 +
 9 files changed, 199 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d138d5f913b51..8cf16783d3001 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2319,6 +2319,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_summary_in_toast_title" = "Stars Acquired";
 "lng_credits_summary_in_toast_about#one" = "**{count}** Star added to your balance.";
 "lng_credits_summary_in_toast_about#other" = "**{count}** Stars added to your balance.";
+"lng_credits_box_history_entry_peer" = "Recipient";
+"lng_credits_box_history_entry_id" = "Transaction ID";
+"lng_credits_box_history_entry_id_copied" = "Transaction ID copied to clipboard.";
+"lng_credits_box_history_entry_about" = "You can dispute this transaction {link}.";
+"lng_credits_box_history_entry_about_link" = "here";
 
 "lng_location_title" = "Location";
 "lng_location_about" = "Display the location of your business on your account.";
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 339e7ee303d13..ef87c642369b6 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -19,6 +19,7 @@ For license and copyright information please follow this link:
 #include "data/data_boosts.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
+#include "data/data_credits.h"
 #include "data/data_media_types.h" // Data::GiveawayStart.
 #include "data/data_peer_values.h" // Data::PeerPremiumValue.
 #include "data/data_session.h"
@@ -1633,3 +1634,50 @@ void ResolveGiveawayInfo(
 		messageId,
 		crl::guard(controller, show));
 }
+
+void AddCreditsHistoryEntryTable(
+		not_null<Window::SessionNavigation*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		const Data::CreditsHistoryEntry &entry) {
+	auto table = container->add(
+		object_ptr<Ui::TableLayout>(
+			container,
+			st::giveawayGiftCodeTable),
+		st::giveawayGiftCodeTableMargin);
+	if (entry.bareId) {
+		AddTableRow(
+			table,
+			tr::lng_credits_box_history_entry_peer(),
+			controller,
+			PeerId(entry.bareId));
+	}
+	if (!entry.id.isEmpty()) {
+		constexpr auto kOneLineCount = 18;
+		const auto oneLine = entry.id.length() <= kOneLineCount;
+		auto label = object_ptr<Ui::FlatLabel>(
+			table,
+			rpl::single(
+				Ui::Text::Wrapped({ entry.id }, EntityType::Code, {})),
+			oneLine
+				? st::giveawayGiftCodeValue
+				: st::giveawayGiftCodeValueMultiline);
+		label->setClickHandlerFilter([=](const auto &...) {
+			TextUtilities::SetClipboardText(
+				TextForMimeData::Simple(entry.id));
+			controller->showToast(
+				tr::lng_credits_box_history_entry_id_copied(tr::now));
+			return false;
+		});
+		AddTableRow(
+			table,
+			tr::lng_credits_box_history_entry_id(),
+			std::move(label),
+			st::giveawayGiftCodeValueMargin);
+	}
+	if (!entry.date.isNull()) {
+		AddTableRow(
+			table,
+			tr::lng_gift_link_label_date(),
+			rpl::single(Ui::Text::WithEntities(langDateTime(entry.date))));
+	}
+}
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.h b/Telegram/SourceFiles/boxes/gift_premium_box.h
index b054bc3a212a9..e3194b2736814 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.h
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.h
@@ -16,12 +16,14 @@ struct GiftCode;
 } // namespace Api
 
 namespace Data {
+struct CreditsHistoryEntry;
 struct GiveawayStart;
 struct GiveawayResults;
 } // namespace Data
 
 namespace Ui {
 class GenericBox;
+class VerticalLayout;
 } // namespace Ui
 
 namespace Window {
@@ -71,3 +73,8 @@ void ResolveGiveawayInfo(
 	MsgId messageId,
 	std::optional<Data::GiveawayStart> start,
 	std::optional<Data::GiveawayResults> results);
+
+void AddCreditsHistoryEntryTable(
+	not_null<Window::SessionNavigation*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	const Data::CreditsHistoryEntry &entry);
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
index 2368a616feaa5..ef705ab2a86f3 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
@@ -95,6 +95,10 @@ giveawayGiftCodeValue: FlatLabel(defaultFlatLabel) {
 		linkUnderline: kLinkUnderlineNever;
 	}
 }
+giveawayGiftCodeValueMultiline: FlatLabel(giveawayGiftCodeValue) {
+	minWidth: 100px;
+	maxHeight: 0px;
+}
 giveawayGiftCodeValueMargin: margins(13px, 9px, 13px, 9px);
 giveawayGiftCodePeerMargin: margins(11px, 6px, 11px, 4px);
 giveawayGiftCodeUserpic: UserpicButton(defaultUserpicButton) {
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 5a7c7e1bc4c92..5154a3044058e 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -783,9 +783,7 @@ const Data::CreditsHistoryEntry &CreditsRow::entry() const {
 QString CreditsRow::generateName() {
 	return !PeerListRow::special()
 		? PeerListRow::generateName()
-		: (_entry.peerType == Data::CreditsHistoryEntry::PeerType::Fragment)
-		? tr::lng_bot_username_description1_link(tr::now)
-		: tr::lng_credits_summary_history_entry_inner_in(tr::now);
+		: Ui::GenerateEntryName(_entry).text;
 }
 
 PaintRoundImageCallback CreditsRow::generatePaintUserpicCallback(bool force) {
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index a1fde01f49f92..44326a9afbb44 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -8,7 +8,9 @@ For license and copyright information please follow this link:
 #include "settings/settings_credits.h"
 
 #include "api/api_credits.h"
+#include "boxes/gift_premium_box.h"
 #include "core/click_handler_types.h"
+#include "data/data_session.h"
 #include "data/data_user.h"
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
 #include "info/statistics/info_statistics_list_controllers.h"
@@ -19,9 +21,12 @@ For license and copyright information please follow this link:
 #include "settings/settings_common_session.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/boost_box.h" // Ui::StartFireworks.
+#include "ui/controls/userpic_button.h"
+#include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h"
 #include "ui/image/image_prepare.h"
+#include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/text/format_values.h"
@@ -32,12 +37,15 @@ For license and copyright information please follow this link:
 #include "ui/widgets/labels.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #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"
 #include "styles/style_settings.h"
 #include "styles/style_statistics.h"
 
@@ -455,7 +463,117 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 			}
 		}, inner->lifetime());
 
+		const auto controller = _controller->parentController();
+		const auto entryBox = [=](
+				not_null<Ui::GenericBox*> box,
+				const Data::CreditsHistoryEntry &e) {
+			box->setStyle(st::giveawayGiftCodeBox);
+			box->setNoContentMargin(true);
+
+			const auto content = box->verticalLayout();
+			Ui::AddSkip(content);
+			Ui::AddSkip(content);
+			Ui::AddSkip(content);
+
+			const auto &stUser = st::boostReplaceUserpic;
+			const auto peer = e.bareId
+				? _controller->session().data().peer(PeerId(e.bareId))
+				: nullptr;
+			if (peer) {
+				content->add(object_ptr<Ui::CenterWrap<>>(
+					content,
+					object_ptr<Ui::UserpicButton>(content, peer, stUser)));
+			} else {
+				const auto widget = content->add(
+					object_ptr<Ui::CenterWrap<>>(
+						content,
+						object_ptr<Ui::RpWidget>(content)))->entity();
+				using Draw = Fn<void(Painter &, int, int, int, int)>;
+				const auto draw = widget->lifetime().make_state<Draw>(
+					Ui::GenerateCreditsPaintUserpicCallback(e));
+				widget->resize(Size(stUser.photoSize));
+				widget->paintRequest(
+				) | rpl::start_with_next([=] {
+					auto p = Painter(widget);
+					(*draw)(p, 0, 0, stUser.photoSize, stUser.photoSize);
+				}, widget->lifetime());
+			}
+
+			Ui::AddSkip(content);
+			Ui::AddSkip(content);
+
+
+			box->addRow(object_ptr<Ui::CenterWrap<>>(
+				box,
+				object_ptr<Ui::FlatLabel>(
+					box,
+					rpl::single(peer
+						? peer->name()
+						: Ui::GenerateEntryName(e).text),
+					st::creditsBoxAboutTitle)));
+
+			Ui::AddSkip(content);
+
+			{
+				constexpr auto kMinus = QChar(0x2212);
+				auto &lifetime = content->lifetime();
+				const auto text = lifetime.make_state<Ui::Text::String>(
+					st::semiboldTextStyle,
+					(!e.bareId ? QChar('+') : kMinus)
+						+ Lang::FormatCountDecimal(e.credits));
+
+				const auto amount = content->add(
+					object_ptr<Ui::FixedHeightWidget>(
+						content,
+						_star.height() / style::DevicePixelRatio()));
+				const auto font = text->style()->font;
+				amount->paintRequest(
+				) | rpl::start_with_next([=] {
+					auto p = Painter(amount);
+					const auto starWidth = _star.width()
+						/ style::DevicePixelRatio();
+					const auto fullWidth = text->maxWidth()
+						+ font->spacew * 2
+						+ starWidth;
+					p.setPen(!e.bareId
+						? st::boxTextFgGood
+						: st::menuIconAttentionColor);
+					const auto x = (amount->width() - fullWidth) / 2;
+					text->draw(p, Ui::Text::PaintContext{
+						.position = QPoint(
+							x,
+							(amount->height() - font->height) / 2),
+						.outerWidth = amount->width(),
+						.availableWidth = amount->width(),
+					});;
+					p.drawImage(
+						x + fullWidth - starWidth,
+						0,
+						_star);
+				}, amount->lifetime());
+			}
+
+			Ui::AddSkip(content);
+			Ui::AddSkip(content);
+
+			AddCreditsHistoryEntryTable(
+				controller,
+				box->verticalLayout(),
+				e);
+
+			const auto button = box->addButton(tr::lng_box_ok(), [=] {
+				box->closeBox();
+			});
+			const auto buttonWidth = st::boxWidth
+				- 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 entryClicked = [=](const Data::CreditsHistoryEntry &e) {
+			controller->uiShow()->show(Box(entryBox, e));
 		};
 
 		Info::Statistics::AddCreditsHistoryList(
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 19c73c7ba29c1..9f6866f964ef5 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -30,3 +30,7 @@ creditsBoxAbout: FlatLabel(defaultFlatLabel) {
 	minWidth: 256px;
 	align: align(top);
 }
+
+creditsBoxAboutTitle: FlatLabel(settingsPremiumUserTitle) {
+	minWidth: 256px;
+}
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
index 555ee44c0d643..fd465f6b33d17 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include <QtCore/QDateTime>
 
 #include "data/data_credits.h"
+#include "lang/lang_keys.h"
 #include "ui/empty_userpic.h"
 #include "ui/painter.h"
 #include "styles/style_credits.h"
@@ -52,4 +53,12 @@ PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 	};
 }
 
+TextWithEntities GenerateEntryName(const Data::CreditsHistoryEntry &entry) {
+	return ((entry.peerType == Data::CreditsHistoryEntry::PeerType::Fragment)
+		? tr::lng_bot_username_description1_link
+		: tr::lng_credits_summary_history_entry_inner_in)(
+			tr::now,
+			TextWithEntities::Simple);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.h b/Telegram/SourceFiles/ui/effects/credits_graphics.h
index c7d8584df8356..44d848748a15a 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.h
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.h
@@ -16,4 +16,7 @@ namespace Ui {
 Fn<void(Painter &, int, int, int, int)> GenerateCreditsPaintUserpicCallback(
 	const Data::CreditsHistoryEntry &entry);
 
+[[nodiscard]] TextWithEntities GenerateEntryName(
+	const Data::CreditsHistoryEntry &entry);
+
 } // namespace Ui

From 5ee2bca616f2d24830b15fb34f8ed54a4c9aa35b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 09:39:52 +0400
Subject: [PATCH 239/400] Update API scheme on layer 181.

---
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  4 +-
 .../SourceFiles/payments/payments_form.cpp    | 42 +++++++++++++++++++
 Telegram/SourceFiles/payments/payments_form.h |  2 +
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index deb1d9e807460..fb82b7ff9361d 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -910,6 +910,7 @@ payments.paymentResult#4e5f810d updates:Updates = payments.PaymentResult;
 payments.paymentVerificationNeeded#d8411139 url:string = payments.PaymentResult;
 
 payments.paymentReceipt#70c4fe03 flags:# date:int bot_id:long provider_id:long title:string description:string photo:flags.2?WebDocument invoice:Invoice info:flags.0?PaymentRequestedInfo shipping:flags.1?ShippingOption tip_amount:flags.3?long currency:string total_amount:long credentials_title:string users:Vector<User> = payments.PaymentReceipt;
+payments.paymentReceiptStars#dabbf83a flags:# date:int bot_id:long title:string description:string photo:flags.2?WebDocument invoice:Invoice currency:string total_amount:long transaction_id:string users:Vector<User> = payments.PaymentReceipt;
 
 payments.savedInfo#fb8fe43c flags:# has_saved_credentials:flags.1?true saved_info:flags.0?PaymentRequestedInfo = payments.SavedInfo;
 
@@ -1802,7 +1803,7 @@ starsTransactionPeer#d80da15d peer:Peer = StarsTransactionPeer;
 
 starsTopupOption#bd915c0 flags:# extended:flags.1?true stars:long store_product:flags.0?string currency:string amount:long = StarsTopupOption;
 
-starsTransaction#5f6b790c id:string stars:long date:int peer:StarsTransactionPeer = StarsTransaction;
+starsTransaction#cc7079b2 flags:# id:string stars:long date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument = StarsTransaction;
 
 payments.starsStatus#8cf4ee60 flags:# balance:long history:Vector<StarsTransaction> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.StarsStatus;
 
@@ -2350,6 +2351,7 @@ payments.getStarsTopupOptions#c00ec7d3 = Vector<StarsTopupOption>;
 payments.getStarsStatus#104fcfa7 peer:InputPeer = payments.StarsStatus;
 payments.getStarsTransactions#673ac2f9 flags:# inbound:flags.0?true outbound:flags.1?true peer:InputPeer offset:string = payments.StarsStatus;
 payments.sendStarsForm#2bb731d flags:# form_id:long invoice:InputInvoice = payments.PaymentResult;
+payments.refundStarsCharge#f090bbec user_id:InputUser msg_id:int charge_id:string = Updates;
 
 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;
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index 07a6b2a675acd..b6512d532daff 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -471,6 +471,17 @@ void Form::processReceipt(const MTPDpayments_paymentReceipt &data) {
 	_updates.fire(FormReady{});
 }
 
+void Form::processReceipt(const MTPDpayments_paymentReceiptStars &data) {
+	_session->data().processUsers(data.vusers());
+
+	data.vinvoice().match([&](const auto &data) {
+		processInvoice(data);
+	});
+	processDetails(data);
+	fillPaymentMethodInformation();
+	_updates.fire(FormReady{});
+}
+
 void Form::processInvoice(const MTPDinvoice &data) {
 	const auto suggested = data.vsuggested_tip_amounts().value_or_empty();
 	_invoice = Ui::Invoice{
@@ -586,6 +597,37 @@ void Form::processDetails(const MTPDpayments_paymentReceipt &data) {
 	}
 }
 
+void Form::processDetails(const MTPDpayments_paymentReceiptStars &data) {
+	_invoice.receipt = Ui::Receipt{
+		.date = data.vdate().v,
+		.totalAmount = ParsePriceAmount(data.vtotal_amount().v),
+		.currency = qs(data.vcurrency()),
+		.paid = true,
+	};
+	_details = FormDetails{
+		.botId = data.vbot_id().v,
+	};
+	if (_invoice.cover.title.isEmpty()
+		&& _invoice.cover.description.empty()
+		&& _invoice.cover.thumbnail.isNull()
+		&& !_thumbnailLoadProcess) {
+		_invoice.cover = Ui::Cover{
+			.title = qs(data.vtitle()),
+			.description = { qs(data.vdescription()) },
+		};
+		if (const auto web = data.vphoto()) {
+			if (const auto photo = _session->data().photoFromWeb(*web, {})) {
+				loadThumbnail(photo);
+			}
+		}
+	}
+	if (_details.botId) {
+		if (const auto bot = _session->data().userLoaded(_details.botId)) {
+			_invoice.cover.seller = bot->name();
+		}
+	}
+}
+
 void Form::processSavedInformation(const MTPDpaymentRequestedInfo &data) {
 	const auto address = data.vshipping_address();
 	_savedInformation = _information = Ui::RequestedInformation{
diff --git a/Telegram/SourceFiles/payments/payments_form.h b/Telegram/SourceFiles/payments/payments_form.h
index 8341131159d0f..ffa6b17d73447 100644
--- a/Telegram/SourceFiles/payments/payments_form.h
+++ b/Telegram/SourceFiles/payments/payments_form.h
@@ -301,9 +301,11 @@ class Form final : public base::has_weak_ptr {
 	void requestReceipt();
 	void processForm(const MTPpayments_PaymentForm &result);
 	void processReceipt(const MTPDpayments_paymentReceipt &data);
+	void processReceipt(const MTPDpayments_paymentReceiptStars &data);
 	void processInvoice(const MTPDinvoice &data);
 	void processDetails(const MTPpayments_PaymentForm &result);
 	void processDetails(const MTPDpayments_paymentReceipt &data);
+	void processDetails(const MTPDpayments_paymentReceiptStars &data);
 	void processSavedInformation(const MTPDpaymentRequestedInfo &data);
 	void processAdditionalPaymentMethods(
 		const QVector<MTPPaymentFormMethod> &list);

From b299881bf86ada72f246af54eed51c2d87634561 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 May 2024 18:15:56 +0400
Subject: [PATCH 240/400] Track factcheck text and create media.

---
 .../data/components/factchecks.cpp            | 136 ++++++++++++++++++
 .../SourceFiles/data/components/factchecks.h  |  51 +++++++
 Telegram/SourceFiles/data/data_session.cpp    |  20 ++-
 .../admin_log/history_admin_log_inner.cpp     |   2 +
 Telegram/SourceFiles/history/history_item.cpp |  34 +++++
 Telegram/SourceFiles/history/history_item.h   |   4 +
 .../history/history_item_components.cpp       |  25 ++++
 .../history/history_item_components.h         |  25 ++++
 .../SourceFiles/history/history_item_text.cpp |  11 ++
 .../history/view/history_view_message.cpp     |  23 +++
 .../history/view/history_view_message.h       |   5 +
 Telegram/SourceFiles/main/main_session.cpp    |   2 +
 Telegram/SourceFiles/main/main_session.h      |   5 +
 13 files changed, 332 insertions(+), 11 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/components/factchecks.cpp
 create mode 100644 Telegram/SourceFiles/data/components/factchecks.h

diff --git a/Telegram/SourceFiles/data/components/factchecks.cpp b/Telegram/SourceFiles/data/components/factchecks.cpp
new file mode 100644
index 0000000000000..4e5fcd090c117
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/factchecks.cpp
@@ -0,0 +1,136 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/components/factchecks.h"
+
+#include "apiwrap.h"
+#include "base/random.h"
+#include "data/data_session.h"
+#include "history/view/media/history_view_web_page.h"
+#include "history/view/history_view_message.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kRequestDelay = crl::time(1000);
+
+} // namespace
+
+Factchecks::Factchecks(not_null<Main::Session*> session)
+: _session(session)
+, _requestTimer([=] { request(); }) {
+}
+
+void Factchecks::requestFor(not_null<HistoryItem*> item) {
+	subscribeIfNotYet();
+
+	if (const auto factcheck = item->Get<HistoryMessageFactcheck>()) {
+		factcheck->requested = true;
+	}
+	if (!_requestTimer.isActive()) {
+		_requestTimer.callOnce(kRequestDelay);
+	}
+	const auto changed = !_pending.empty()
+		&& (_pending.front()->history() != item->history());
+	const auto added = _pending.emplace(item).second;
+	if (changed) {
+		request();
+	} else if (added && _pending.size() == 1) {
+		_requestTimer.callOnce(kRequestDelay);
+	}
+}
+
+void Factchecks::subscribeIfNotYet() {
+	if (_subscribed) {
+		return;
+	}
+	_subscribed = true;
+
+	_session->data().itemRemoved(
+	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+		_pending.remove(item);
+		const auto i = ranges::find(_requested, item.get());
+		if (i != end(_requested)) {
+			*i = nullptr;
+		}
+	}, _lifetime);
+}
+
+void Factchecks::request() {
+	_requestTimer.cancel();
+
+	if (!_requested.empty() || _pending.empty()) {
+		return;
+	}
+	_session->api().request(base::take(_requestId)).cancel();
+
+	auto ids = QVector<MTPint>();
+	ids.reserve(_pending.size());
+	const auto history = _pending.front()->history();
+	for (auto i = begin(_pending); i != end(_pending);) {
+		const auto &item = *i;
+		if (item->history() == history) {
+			_requested.push_back(item);
+			ids.push_back(MTP_int(item->id.bare));
+			i = _pending.erase(i);
+		} else {
+			++i;
+		}
+	}
+	_requestId = _session->api().request(MTPmessages_GetFactCheck(
+		history->peer->input,
+		MTP_vector<MTPint>(std::move(ids))
+	)).done([=](const MTPVector<MTPFactCheck> &result) {
+		_requestId = 0;
+		const auto &list = result.v;
+		auto index = 0;
+		for (const auto &item : base::take(_requested)) {
+			if (!item) {
+			} else if (index >= list.size()) {
+				item->setFactcheck({});
+			} else {
+				item->setFactcheck(FromMTP(item, &list[index]));
+			}
+			++index;
+		}
+		if (!_pending.empty()) {
+			request();
+		}
+	}).fail([=] {
+		_requestId = 0;
+		for (const auto &item : base::take(_requested)) {
+			if (item) {
+				item->setFactcheck({});
+			}
+		}
+		if (!_pending.empty()) {
+			request();
+		}
+	}).send();
+}
+
+std::unique_ptr<HistoryView::WebPage> Factchecks::makeMedia(
+		not_null<HistoryView::Message*> view,
+		not_null<HistoryMessageFactcheck*> factcheck) {
+	if (!factcheck->page) {
+		factcheck->page = view->history()->owner().webpage(
+			base::RandomValue<WebPageId>(),
+			tr::lng_factcheck_title(tr::now),
+			factcheck->data.text);
+	}
+	return std::make_unique<HistoryView::WebPage>(
+		view,
+		factcheck->page,
+		MediaWebPageFlags());
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/factchecks.h b/Telegram/SourceFiles/data/components/factchecks.h
new file mode 100644
index 0000000000000..452706f9b076e
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/factchecks.h
@@ -0,0 +1,51 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+
+class HistoryItem;
+struct HistoryMessageFactcheck;
+
+namespace HistoryView {
+class Message;
+class WebPage;
+} // namespace HistoryView
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+class Factchecks final {
+public:
+	explicit Factchecks(not_null<Main::Session*> session);
+
+	void requestFor(not_null<HistoryItem*> item);
+	[[nodiscard]] std::unique_ptr<HistoryView::WebPage> makeMedia(
+		not_null<HistoryView::Message*> view,
+		not_null<HistoryMessageFactcheck*> factcheck);
+
+private:
+	void subscribeIfNotYet();
+	void request();
+
+	const not_null<Main::Session*> _session;
+
+	base::Timer _requestTimer;
+	base::flat_set<not_null<HistoryItem*>> _pending;
+	std::vector<HistoryItem*> _requested;
+	mtpRequestId _requestId = 0;
+	bool _subscribed = false;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index d101d5d883b0b..529b933d4bd94 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -4250,29 +4250,27 @@ void Session::notifyPollUpdateDelayed(not_null<PollData*> poll) {
 }
 
 void Session::sendWebPageGamePollNotifications() {
+	auto resize = std::vector<not_null<ViewElement*>>();
 	for (const auto &page : base::take(_webpagesUpdated)) {
 		_webpageUpdates.fire_copy(page);
-		const auto i = _webpageViews.find(page);
-		if (i != _webpageViews.end()) {
-			for (const auto &view : i->second) {
-				requestViewResize(view);
-			}
+		if (const auto i = _webpageViews.find(page)
+			; i != _webpageViews.end()) {
+			resize.insert(end(resize), begin(i->second), end(i->second));
 		}
 	}
 	for (const auto &game : base::take(_gamesUpdated)) {
 		if (const auto i = _gameViews.find(game); i != _gameViews.end()) {
-			for (const auto &view : i->second) {
-				requestViewResize(view);
-			}
+			resize.insert(end(resize), begin(i->second), end(i->second));
 		}
 	}
 	for (const auto &poll : base::take(_pollsUpdated)) {
 		if (const auto i = _pollViews.find(poll); i != _pollViews.end()) {
-			for (const auto &view : i->second) {
-				requestViewResize(view);
-			}
+			resize.insert(end(resize), begin(i->second), end(i->second));
 		}
 	}
+	for (const auto &view : resize) {
+		requestViewResize(view);
+	}
 }
 
 rpl::producer<not_null<WebPageData*>> Session::webPageUpdates() const {
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 61cf9a8897b0b..8fa440bf6b9ba 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -1306,6 +1306,8 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					&& !link
 					&& (view->hasVisibleText()
 						|| mediaHasTextForCopy
+						|| (item->Has<HistoryMessageFactcheck>()
+							&& !item->Get<HistoryMessageFactcheck>()->data.text.empty())
 						|| item->Has<HistoryMessageLogEntryOriginal>())) {
 					_menu->addAction(tr::lng_context_copy_text(tr::now), [=] {
 						copyContextText(itemId);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 7cb74b1891bab..3a2ed484a5679 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -415,6 +415,11 @@ HistoryItem::HistoryItem(
 		}
 		setReactions(data.vreactions());
 		applyTTL(data);
+
+		if (const auto check = FromMTP(this, data.vfactcheck())) {
+			AddComponents(HistoryMessageFactcheck::Bit());
+			Get<HistoryMessageFactcheck>()->data = check;
+		}
 	}
 }
 
@@ -1494,6 +1499,33 @@ void HistoryItem::addLogEntryOriginal(
 		content);
 }
 
+void HistoryItem::setFactcheck(MessageFactcheck info) {
+	if (!info) {
+		if (Has<HistoryMessageFactcheck>()) {
+			RemoveComponents(HistoryMessageFactcheck::Bit());
+			history()->owner().requestItemResize(this);
+		}
+	} else {
+		AddComponents(HistoryMessageFactcheck::Bit());
+		const auto factcheck = Get<HistoryMessageFactcheck>();
+		if (factcheck->data.hash == info.hash
+			&& (info.needCheck || !factcheck->data.needCheck)) {
+			return;
+		} else if (factcheck->data.text != info.text
+			|| factcheck->data.country != info.country
+			|| factcheck->data.hash != info.hash) {
+			factcheck->data = std::move(info);
+			factcheck->requested = false;
+			history()->owner().requestItemResize(this);
+		}
+	}
+}
+
+bool HistoryItem::hasUnrequestedFactcheck() const {
+	const auto factcheck = Get<HistoryMessageFactcheck>();
+	return factcheck && factcheck->data.needCheck && !factcheck->requested;
+}
+
 PeerData *HistoryItem::specialNotificationPeer() const {
 	return (mentionsMe() && !_history->peer->isUser())
 		? from().get()
@@ -3143,6 +3175,8 @@ EffectId HistoryItem::effectId() const {
 bool HistoryItem::isEmpty() const {
 	return _text.empty()
 		&& !_media
+		&& (!Has<HistoryMessageFactcheck>()
+			|| Get<HistoryMessageFactcheck>()->data.text.empty())
 		&& !Has<HistoryMessageLogEntryOriginal>();
 }
 
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 1b006e35a7e6c..5a864d076daa8 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -23,9 +23,11 @@ struct HistoryMessageReplyMarkup;
 struct HistoryMessageTranslation;
 struct HistoryMessageForwarded;
 struct HistoryMessageSavedMediaData;
+struct HistoryMessageFactcheck;
 struct HistoryServiceDependentData;
 enum class HistorySelfDestructType;
 struct PreparedServiceText;
+struct MessageFactcheck;
 class ReplyKeyboard;
 struct LanguageId;
 
@@ -204,6 +206,8 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 		WebPageId localId,
 		const QString &label,
 		const TextWithEntities &content);
+	void setFactcheck(MessageFactcheck info);
+	[[nodiscard]] bool hasUnrequestedFactcheck() const;
 
 	[[nodiscard]] not_null<Data::Thread*> notificationThread() const;
 	[[nodiscard]] not_null<History*> history() const {
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index dc4a38c7a0d6a..54e42a16eea5c 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -1062,6 +1062,31 @@ HistoryMessageLogEntryOriginal &HistoryMessageLogEntryOriginal::operator=(
 
 HistoryMessageLogEntryOriginal::~HistoryMessageLogEntryOriginal() = default;
 
+MessageFactcheck FromMTP(
+		not_null<HistoryItem*> item,
+		const tl::conditional<MTPFactCheck> &factcheck) {
+	auto result = MessageFactcheck();
+	if (!factcheck) {
+		return result;
+	}
+	const auto &data = factcheck->data();
+	if (const auto text = data.vtext()) {
+		const auto &data = text->data();
+		result.text = {
+			qs(data.vtext()),
+			Api::EntitiesFromMTP(
+				&item->history()->session(),
+				data.ventities().v),
+		};
+	}
+	if (const auto country = data.vcountry()) {
+		result.country = qs(country->v);
+	}
+	result.hash = data.vhash().v;
+	result.needCheck = data.is_need_check();
+	return result;
+}
+
 HistoryDocumentCaptioned::HistoryDocumentCaptioned()
 : caption(st::msgFileMinWidth - st::msgPadding.left() - st::msgPadding.right()) {
 }
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 44f31f3cd1b40..fa7ffbf3a99f5 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -562,6 +562,31 @@ struct HistoryMessageLogEntryOriginal
 
 };
 
+struct MessageFactcheck {
+	TextWithEntities text;
+	QString country;
+	uint64 hash = 0;
+	bool needCheck = false;
+
+	[[nodiscard]] bool empty() const {
+		return text.empty() && country.isEmpty() && !hash;
+	}
+	explicit operator bool() const {
+		return !empty();
+	}
+};
+
+[[nodiscard]] MessageFactcheck FromMTP(
+	not_null<HistoryItem*> item,
+	const tl::conditional<MTPFactCheck> &factcheck);
+
+struct HistoryMessageFactcheck
+: public RuntimeComponent<HistoryMessageFactcheck, HistoryItem> {
+	MessageFactcheck data;
+	WebPageData *page = nullptr;
+	bool requested = false;
+};
+
 struct HistoryServiceData
 : public RuntimeComponent<HistoryServiceData, HistoryItem> {
 	std::vector<ClickHandlerPtr> textLinks;
diff --git a/Telegram/SourceFiles/history/history_item_text.cpp b/Telegram/SourceFiles/history/history_item_text.cpp
index 1c66c59a487d6..ba35168cfe3cc 100644
--- a/Telegram/SourceFiles/history/history_item_text.cpp
+++ b/Telegram/SourceFiles/history/history_item_text.cpp
@@ -46,6 +46,12 @@ TextForMimeData HistoryItemText(not_null<HistoryItem*> item) {
 		titleResult.append('\n').append(std::move(descriptionResult));
 		return titleResult;
 	}();
+	auto factcheckResult = [&] {
+		const auto factcheck = item->Get<HistoryMessageFactcheck>();
+		return factcheck
+			? TextForMimeData::Rich(base::duplicate(factcheck->data.text))
+			: TextForMimeData();
+	}();
 	auto result = textResult;
 	if (result.empty()) {
 		result = std::move(mediaResult);
@@ -57,6 +63,11 @@ TextForMimeData HistoryItemText(not_null<HistoryItem*> item) {
 	} else if (!logEntryOriginalResult.empty()) {
 		result.append(u"\n\n"_q).append(std::move(logEntryOriginalResult));
 	}
+	if (result.empty()) {
+		result = std::move(factcheckResult);
+	} else if (!factcheckResult.empty()) {
+		result.append(u"\n\n"_q).append(std::move(factcheckResult));
+	}
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index cf19c8f9a3696..861c96ee76997 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -27,6 +27,7 @@ For license and copyright information please follow this link:
 #include "ui/round_rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/power_saving.h"
+#include "data/components/factchecks.h"
 #include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -799,6 +800,24 @@ QSize Message::performCountOptimalSize() {
 		RemoveComponents(Reply::Bit());
 	}
 
+	const auto factcheck = item->Get<HistoryMessageFactcheck>();
+	if (factcheck && !factcheck->data.text.empty()) {
+		AddComponents(Factcheck::Bit());
+		Get<Factcheck>()->page = history()->session().factchecks().makeMedia(
+			this,
+			factcheck);
+
+		auto copy = data()->originalText();
+		if (!copy.text.contains("FACT CHECK")) {
+			copy.append("\n\nFACT CHECK!!\n\n").append(factcheck->data.text);
+			crl::on_main(this, [=] {
+				data()->setText(std::move(copy));
+			});
+		}
+	} else {
+		RemoveComponents(Factcheck::Bit());
+	}
+
 	const auto markup = item->inlineReplyMarkup();
 	const auto reactionsKey = [&] {
 		return embedReactionsInBottomInfo()
@@ -1069,6 +1088,10 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 	const auto item = data();
 	const auto media = this->media();
 
+	if (item->hasUnrequestedFactcheck()) {
+		item->history()->session().factchecks().requestFor(item);
+	}
+
 	const auto stm = context.messageStyle();
 	const auto bubble = drawBubble();
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index a8c172c03df37..5f64193d721cb 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -44,6 +44,11 @@ struct LogEntryOriginal
 	std::unique_ptr<WebPage> page;
 };
 
+struct Factcheck
+: public RuntimeComponent<Factcheck, Element> {
+	std::unique_ptr<WebPage> page;
+};
+
 struct PsaTooltipState : public RuntimeComponent<PsaTooltipState, Element> {
 	QString type;
 	mutable ClickHandlerPtr link;
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index fc8435d667db6..951ec735acc30 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -29,6 +29,7 @@ For license and copyright information please follow this link:
 #include "storage/file_upload.h"
 #include "storage/storage_account.h"
 #include "storage/storage_facade.h"
+#include "data/components/factchecks.h"
 #include "data/components/recent_peers.h"
 #include "data/components/scheduled_messages.h"
 #include "data/components/sponsored_messages.h"
@@ -105,6 +106,7 @@ Session::Session(
 , _scheduledMessages(std::make_unique<Data::ScheduledMessages>(this))
 , _sponsoredMessages(std::make_unique<Data::SponsoredMessages>(this))
 , _topPeers(std::make_unique<Data::TopPeers>(this))
+, _factchecks(std::make_unique<Data::Factchecks>(this))
 , _cachedReactionIconFactory(std::make_unique<ReactionIconFactory>())
 , _supportHelper(Support::Helper::Create(this))
 , _saveSettingsTimer([=] { saveSettings(); }) {
diff --git a/Telegram/SourceFiles/main/main_session.h b/Telegram/SourceFiles/main/main_session.h
index 85aa2fe0868f4..9581e7cd424df 100644
--- a/Telegram/SourceFiles/main/main_session.h
+++ b/Telegram/SourceFiles/main/main_session.h
@@ -35,6 +35,7 @@ class RecentPeers;
 class ScheduledMessages;
 class SponsoredMessages;
 class TopPeers;
+class Factchecks;
 } // namespace Data
 
 namespace HistoryView::Reactions {
@@ -127,6 +128,9 @@ class Session final : public base::has_weak_ptr {
 	[[nodiscard]] Data::TopPeers &topPeers() const {
 		return *_topPeers;
 	}
+	[[nodiscard]] Data::Factchecks &factchecks() const {
+		return *_factchecks;
+	}
 	[[nodiscard]] Api::Updates &updates() const {
 		return *_updates;
 	}
@@ -254,6 +258,7 @@ class Session final : public base::has_weak_ptr {
 	const std::unique_ptr<Data::ScheduledMessages> _scheduledMessages;
 	const std::unique_ptr<Data::SponsoredMessages> _sponsoredMessages;
 	const std::unique_ptr<Data::TopPeers> _topPeers;
+	const std::unique_ptr<Data::Factchecks> _factchecks;
 
 	using ReactionIconFactory = HistoryView::Reactions::CachedIconFactory;
 	const std::unique_ptr<ReactionIconFactory> _cachedReactionIconFactory;

From 923a9ec6a8122a887a839570107a6114c40ae2de Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 23 May 2024 13:07:03 +0400
Subject: [PATCH 241/400] Show toggle-able factcheck footer.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |   6 +
 .../data/components/factchecks.cpp            |   2 +
 Telegram/SourceFiles/data/data_web_page.h     |   2 +
 .../admin_log/history_admin_log_item.cpp      |   5 +-
 .../history/view/history_view_message.cpp     | 196 ++++++++--
 .../history/view/history_view_message.h       |   2 +
 .../view/media/history_view_web_page.cpp      | 359 +++++++++++-------
 .../view/media/history_view_web_page.h        |  70 ++--
 9 files changed, 455 insertions(+), 189 deletions(-)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 8d1d2369d298a..a562048ec38af 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -466,6 +466,8 @@ PRIVATE
     data/business/data_business_info.h
     data/business/data_shortcut_messages.cpp
     data/business/data_shortcut_messages.h
+    data/components/factchecks.cpp
+    data/components/factchecks.h
     data/components/recent_peers.cpp
     data/components/recent_peers.h
     data/components/scheduled_messages.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 8cf16783d3001..6b28b450ee06f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3287,6 +3287,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_context_spoiler_effect" = "Hide with Spoiler";
 "lng_context_disable_spoiler" = "Remove Spoiler";
+"lng_context_add_factcheck" = "Add Fact Check";
+
+"lng_factcheck_title" = "Fact Check";
+"lng_factcheck_placeholder" = "Add Facts or Context";
+"lng_factcheck_whats_this" = "what's this?";
+"lng_factcheck_about" = "This clarification was provided by a fact checking agency assigned by the department of the government of your country ({country}) responsible for combatting misinformation.";
 
 "lng_translate_show_original" = "Show Original";
 "lng_translate_bar_to" = "Translate to {name}";
diff --git a/Telegram/SourceFiles/data/components/factchecks.cpp b/Telegram/SourceFiles/data/components/factchecks.cpp
index 4e5fcd090c117..0423d1d4393e9 100644
--- a/Telegram/SourceFiles/data/components/factchecks.cpp
+++ b/Telegram/SourceFiles/data/components/factchecks.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "base/random.h"
 #include "data/data_session.h"
+#include "data/data_web_page.h"
 #include "history/view/media/history_view_web_page.h"
 #include "history/view/history_view_message.h"
 #include "history/history.h"
@@ -126,6 +127,7 @@ std::unique_ptr<HistoryView::WebPage> Factchecks::makeMedia(
 			base::RandomValue<WebPageId>(),
 			tr::lng_factcheck_title(tr::now),
 			factcheck->data.text);
+		factcheck->page->type = WebPageType::Factcheck;
 	}
 	return std::make_unique<HistoryView::WebPage>(
 		view,
diff --git a/Telegram/SourceFiles/data/data_web_page.h b/Telegram/SourceFiles/data/data_web_page.h
index 8b82ed8594776..6497a0394da23 100644
--- a/Telegram/SourceFiles/data/data_web_page.h
+++ b/Telegram/SourceFiles/data/data_web_page.h
@@ -54,6 +54,8 @@ enum class WebPageType : uint8 {
 
 	VoiceChat,
 	Livestream,
+
+	Factcheck,
 };
 [[nodiscard]] WebPageType ParseWebPageType(const MTPDwebPage &type);
 [[nodiscard]] bool IgnoreIv(WebPageType type);
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
index 5e46d8d97b59b..19f76be07aa68 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -111,7 +111,8 @@ MTPMessage PrepareLogMessage(const MTPMessage &message, TimeId newDate) {
 			| MTPDmessage::Flag::f_forwards
 			//| MTPDmessage::Flag::f_reactions
 			| MTPDmessage::Flag::f_restriction_reason
-			| MTPDmessage::Flag::f_ttl_period;
+			| MTPDmessage::Flag::f_ttl_period
+			| MTPDmessage::Flag::f_factcheck;
 		return MTP_message(
 			MTP_flags(data.vflags().v & ~removeFlags),
 			data.vid(),
@@ -141,7 +142,7 @@ MTPMessage PrepareLogMessage(const MTPMessage &message, TimeId newDate) {
 			MTPint(), // ttl_period
 			MTPint(), // quick_reply_shortcut_id
 			MTP_long(data.veffect().value_or_empty()),
-			data.vfactcheck() ? *data.vfactcheck() : MTPFactCheck());
+			MTPFactCheck());
 	});
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 861c96ee76997..564ea3b7b6746 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -586,10 +586,11 @@ void Message::animateReaction(Ui::ReactionFlyAnimationArgs &&args) {
 	}
 
 	if (bubble) {
-		auto entry = logEntryOriginal();
+		const auto check = factcheckBlock();
+		const auto entry = logEntryOriginal();
 
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
 
 		auto inner = g;
@@ -636,10 +637,11 @@ void Message::animateEffect(Ui::ReactionFlyAnimationArgs &&args) {
 		_bottomInfo.animateEffect(args.translated(-bottomRight), repainter);
 	};
 	if (bubble) {
-		auto entry = logEntryOriginal();
+		const auto entry = logEntryOriginal();
+		const auto check = factcheckBlock();
 
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
 
 		auto inner = g;
@@ -732,10 +734,11 @@ QRect Message::effectIconGeometry() const {
 			bottomRight - QPoint(size.width(), size.height()));
 	};
 	if (bubble) {
-		auto entry = logEntryOriginal();
+		const auto entry = logEntryOriginal();
+		const auto check = factcheckBlock();
 
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
 
 		auto inner = g;
@@ -806,14 +809,6 @@ QSize Message::performCountOptimalSize() {
 		Get<Factcheck>()->page = history()->session().factchecks().makeMedia(
 			this,
 			factcheck);
-
-		auto copy = data()->originalText();
-		if (!copy.text.contains("FACT CHECK")) {
-			copy.append("\n\nFACT CHECK!!\n\n").append(factcheck->data.text);
-			crl::on_main(this, [=] {
-				data()->setText(std::move(copy));
-			});
-		}
 	} else {
 		RemoveComponents(Factcheck::Bit());
 	}
@@ -863,6 +858,7 @@ QSize Message::performCountOptimalSize() {
 		const auto forwarded = item->Get<HistoryMessageForwarded>();
 		const auto via = item->Get<HistoryMessageVia>();
 		const auto entry = logEntryOriginal();
+		const auto check = factcheckBlock();
 		if (forwarded) {
 			forwarded->create(via, item);
 		}
@@ -872,13 +868,16 @@ QSize Message::performCountOptimalSize() {
 			mediaDisplayed = media->isDisplayed();
 			media->initDimensions();
 		}
+		if (check) {
+			check->initDimensions();
+		}
 		if (entry) {
 			entry->initDimensions();
 		}
 
 		// Entry page is always a bubble bottom.
 		const auto withVisibleText = hasVisibleText();
-		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
 		maxWidth = plainMaxWidth();
 		if (context() == Context::Replies && item->isDiscussionPost()) {
@@ -918,6 +917,7 @@ QSize Message::performCountOptimalSize() {
 			minHeight += st::msgPadding.top();
 			if (mediaDisplayed) minHeight += st::mediaInBubbleSkip;
 			if (entry) minHeight += st::mediaInBubbleSkip;
+			if (check) minHeight += st::mediaInBubbleSkip;
 		}
 		if (mediaDisplayed) {
 			// Parts don't participate in maxWidth() in case of media message.
@@ -1002,6 +1002,10 @@ QSize Message::performCountOptimalSize() {
 					+ st::msgPadding.right();
 				accumulate_max(maxWidth, replyw);
 			}
+			if (check) {
+				accumulate_max(maxWidth, check->maxWidth());
+				minHeight += check->minHeight();
+			}
 			if (entry) {
 				accumulate_max(maxWidth, entry->maxWidth());
 				minHeight += entry->minHeight();
@@ -1121,11 +1125,12 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 		return;
 	}
 
-	auto entry = logEntryOriginal();
+	const auto entry = logEntryOriginal();
+	const auto check = factcheckBlock();
 	auto mediaDisplayed = media && media->isDisplayed();
 
 	// Entry page is always a bubble bottom.
-	auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+	auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
 	auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
 
 	const auto displayInfo = needInfoDisplay();
@@ -1150,6 +1155,9 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 		if (!mediaOnBottom && (!_viewButton || !reactionsInBubble)) {
 			localMediaBottom -= st::msgPadding.bottom();
 		}
+		if (check) {
+			localMediaBottom -= check->height();
+		}
 		if (entry) {
 			localMediaBottom -= entry->height();
 		}
@@ -1299,6 +1307,9 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 		if (entry) {
 			trect.setHeight(trect.height() - entry->height());
 		}
+		if (check) {
+			trect.setHeight(trect.height() - check->height());
+		}
 		if (displayInfo) {
 			trect.setHeight(trect.height()
 				- (_bottomInfo.height() - st::msgDateFont->height));
@@ -1358,6 +1369,19 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 				}
 			}
 		}
+		if (check) {
+			auto checkLeft = inner.left();
+			auto checkTop = trect.y() + trect.height();
+			p.translate(checkLeft, checkTop);
+			auto checkContext = context.translated(checkLeft, -checkTop);
+			checkContext.selection = skipTextSelection(context.selection);
+			if (mediaDisplayed) {
+				checkContext.selection = media->skipSelection(
+					checkContext.selection);
+			}
+			check->draw(p, checkContext);
+			p.translate(-checkLeft, -checkTop);
+		}
 		if (entry) {
 			auto entryLeft = inner.left();
 			auto entryTop = trect.y() + trect.height();
@@ -1924,10 +1948,11 @@ PointState Message::pointState(QPoint point) const {
 		}
 		if (const auto mediaDisplayed = media && media->isDisplayed()) {
 			// Hack for grouped media point state.
-			auto entry = logEntryOriginal();
+			const auto entry = logEntryOriginal();
+			const auto check = factcheckBlock();
 
 			// Entry page is always a bubble bottom.
-			auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+			auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
 
 			if (item->repliesAreComments() || item->externalReply()) {
 				g.setHeight(g.height() - st::historyCommentsButtonHeight);
@@ -1959,6 +1984,10 @@ PointState Message::pointState(QPoint point) const {
 			//	if (getStateReplyInfo(point, trect, &result)) return result;
 			//	if (getStateViaBotIdInfo(point, trect, &result)) return result;
 			//}
+			if (check) {
+				auto checkHeight = check->height();
+				trect.setHeight(trect.height() - checkHeight);
+			}
 			if (entry) {
 				auto entryHeight = entry->height();
 				trect.setHeight(trect.height() - entryHeight);
@@ -1995,6 +2024,9 @@ void Message::clickHandlerPressedChanged(
 		}
 	}
 	Element::clickHandlerPressedChanged(handler, pressed);
+	if (const auto check = factcheckBlock()) {
+		check->clickHandlerPressedChanged(handler, pressed);
+	}
 	if (!handler) {
 		return;
 	} else if (_rightAction && (handler == _rightAction->link)) {
@@ -2306,10 +2338,11 @@ TextState Message::textState(
 
 	if (bubble) {
 		const auto inBubble = g.contains(point);
-		auto entry = logEntryOriginal();
+		const auto check = factcheckBlock();
+		const auto entry = logEntryOriginal();
 
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
 
 		auto inner = g;
@@ -2393,9 +2426,23 @@ TextState Message::textState(
 					+ visibleMediaTextLength();
 			}
 		}
+		if (check) {
+			auto checkHeight = check->height();
+			trect.setHeight(trect.height() - checkHeight);
+			auto checkLeft = inner.left();
+			auto checkTop = trect.y() + trect.height();
+			if (point.y() >= checkTop && point.y() < checkTop + checkHeight) {
+				result = check->textState(
+					point - QPoint(checkLeft, checkTop),
+					request);
+				result.symbol += visibleTextLength()
+					+ visibleMediaTextLength();
+			}
+		}
 
 		auto checkBottomInfoState = [&] {
-			if (mediaOnBottom && (entry || media->customInfoLayout())) {
+			if (mediaOnBottom
+				&& (check || entry || media->customInfoLayout())) {
 				return;
 			}
 			const auto bottomInfoResult = bottomInfoTextState(
@@ -2862,6 +2909,7 @@ void Message::updatePressed(QPoint point) {
 TextForMimeData Message::selectedText(TextSelection selection) const {
 	const auto media = this->media();
 	auto logEntryOriginalResult = TextForMimeData();
+	auto factcheckResult = TextForMimeData();
 	const auto mediaDisplayed = (media && media->isDisplayed());
 	const auto mediaBefore = mediaDisplayed && invertMedia();
 	const auto textSelection = mediaBefore
@@ -2876,7 +2924,15 @@ TextForMimeData Message::selectedText(TextSelection selection) const {
 	auto mediaResult = (mediaDisplayed || isHiddenByGroup())
 		? media->selectedText(mediaSelection)
 		: TextForMimeData();
-	if (auto entry = logEntryOriginal()) {
+	if (const auto check = factcheckBlock()) {
+		const auto checkSelection = mediaBefore
+			? skipTextSelection(textSelection)
+			: mediaDisplayed
+			? media->skipSelection(mediaSelection)
+			: skipTextSelection(selection);
+		factcheckResult = check->selectedText(checkSelection);
+	}
+	if (const auto entry = logEntryOriginal()) {
 		const auto originalSelection = mediaBefore
 			? skipTextSelection(textSelection)
 			: mediaDisplayed
@@ -2892,6 +2948,11 @@ TextForMimeData Message::selectedText(TextSelection selection) const {
 	} else if (!second.empty()) {
 		result.append(u"\n\n"_q).append(std::move(second));
 	}
+	if (result.empty()) {
+		result = std::move(factcheckResult);
+	} else if (!factcheckResult.empty()) {
+		result.append(u"\n\n"_q).append(std::move(factcheckResult));
+	}
 	if (result.empty()) {
 		result = std::move(logEntryOriginalResult);
 	} else if (!logEntryOriginalResult.empty()) {
@@ -2981,6 +3042,21 @@ TextSelection Message::adjustSelection(
 			? mediaAdjusted
 			: unskipTextSelection(mediaAdjusted);
 	}
+	auto checkResult = TextSelection();
+	if (const auto check = factcheckBlock()) {
+		auto checkSelection = !mediaDisplayed
+			? skipTextSelection(selection)
+			: mediaBefore
+			? skipTextSelection(textSelection)
+			: media->skipSelection(mediaSelection);
+		auto checkAdjusted = useSelection(checkSelection, true)
+			? check->adjustSelection(checkSelection, type)
+			: checkSelection;
+		checkResult = unskipTextSelection(checkAdjusted);
+		if (mediaDisplayed) {
+			checkResult = media->unskipSelection(checkResult);
+		}
+	}
 	auto entryResult = TextSelection();
 	if (const auto entry = logEntryOriginal()) {
 		auto entrySelection = !mediaDisplayed
@@ -3003,6 +3079,12 @@ TextSelection Message::adjustSelection(
 			std::max(result.to, mediaResult.to),
 		};
 	}
+	if (!checkResult.empty()) {
+		result = result.empty() ? checkResult : TextSelection{
+			std::min(result.from, checkResult.from),
+			std::max(result.to, checkResult.to),
+		};
+	}
 	if (!entryResult.empty()) {
 		result = result.empty() ? entryResult : TextSelection{
 			std::min(result.from, entryResult.from),
@@ -3410,6 +3492,13 @@ WebPage *Message::logEntryOriginal() const {
 	return nullptr;
 }
 
+WebPage *Message::factcheckBlock() const {
+	if (const auto entry = Get<Factcheck>()) {
+		return entry->page.get();
+	}
+	return nullptr;
+}
+
 bool Message::toggleSelectionByHandlerClick(
 		const ClickHandlerPtr &handler) const {
 	if (_comments && _comments->link == handler) {
@@ -3539,7 +3628,9 @@ bool Message::drawBubble() const {
 	const auto item = data();
 	if (isHidden()) {
 		return false;
-	} else if (logEntryOriginal() || item->isFakeAboutView()) {
+	} else if (logEntryOriginal()
+		|| factcheckBlock()
+		|| item->isFakeAboutView()) {
 		return true;
 	}
 	const auto media = this->media();
@@ -3560,7 +3651,7 @@ bool Message::unwrapped() const {
 	const auto item = data();
 	if (isHidden()) {
 		return true;
-	} else if (logEntryOriginal()) {
+	} else if (logEntryOriginal() || factcheckBlock()) {
 		return false;
 	}
 	const auto media = this->media();
@@ -3921,8 +4012,22 @@ void Message::updateMediaInBubbleState() {
 			|| Has<Reply>()
 			|| item->Has<HistoryMessageVia>();
 	};
-	auto entry = logEntryOriginal();
-	if (entry) {
+	const auto entry = logEntryOriginal();
+	const auto check = factcheckBlock();
+	if (check) {
+		mediaHasSomethingBelow = true;
+		mediaHasSomethingAbove = getMediaHasSomethingAbove();
+		auto checkState = (mediaHasSomethingAbove
+			|| hasVisibleText()
+			|| (media && media->isDisplayed()))
+			? MediaInBubbleState::Bottom
+			: MediaInBubbleState::None;
+		check->setInBubbleState(checkState);
+		if (!media) {
+			check->setBubbleRounding(countBubbleRounding());
+			return;
+		}
+	} else if (entry) {
 		mediaHasSomethingBelow = true;
 		mediaHasSomethingAbove = getMediaHasSomethingAbove();
 		auto entryState = (mediaHasSomethingAbove
@@ -3947,7 +4052,7 @@ void Message::updateMediaInBubbleState() {
 		return;
 	}
 
-	if (!entry) {
+	if (!check && !entry) {
 		mediaHasSomethingAbove = getMediaHasSomethingAbove();
 	}
 	if (!invertMedia() && hasVisibleText()) {
@@ -4214,10 +4319,11 @@ int Message::resizeContentGetHeight(int newWidth) {
 	if (bubble) {
 		auto reply = Get<Reply>();
 		auto via = item->Get<HistoryMessageVia>();
-		auto entry = logEntryOriginal();
+		const auto check = factcheckBlock();
+		const auto entry = logEntryOriginal();
 
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
 
 		if (reactionsInBubble) {
@@ -4226,12 +4332,20 @@ int Message::resizeContentGetHeight(int newWidth) {
 
 		if (contentWidth == maxWidth()) {
 			if (mediaDisplayed) {
+				if (check) {
+					newHeight += check->resizeGetHeight(contentWidth);
+				}
 				if (entry) {
 					newHeight += entry->resizeGetHeight(contentWidth);
 				}
-			} else if (entry) {
-				// In case of text-only message it is counted in minHeight already.
-				entry->resizeGetHeight(contentWidth);
+			} else {
+				if (check) {
+					check->resizeGetHeight(contentWidth);
+				}
+				if (entry) {
+					// In case of text-only message it is counted in minHeight already.
+					entry->resizeGetHeight(contentWidth);
+				}
 			}
 		} else {
 			const auto withVisibleText = hasVisibleText();
@@ -4251,15 +4365,24 @@ int Message::resizeContentGetHeight(int newWidth) {
 			if (!mediaOnTop) {
 				newHeight += st::msgPadding.top();
 				if (mediaDisplayed) newHeight += st::mediaInBubbleSkip;
+				if (check) newHeight += st::mediaInBubbleSkip;
 				if (entry) newHeight += st::mediaInBubbleSkip;
 			}
 			if (mediaDisplayed) {
 				newHeight += media->height();
+				if (check) {
+					newHeight += check->resizeGetHeight(contentWidth);
+				}
+				if (entry) {
+					newHeight += entry->resizeGetHeight(contentWidth);
+				}
+			} else {
+				if (check) {
+					newHeight += check->resizeGetHeight(contentWidth);
+				}
 				if (entry) {
 					newHeight += entry->resizeGetHeight(contentWidth);
 				}
-			} else if (entry) {
-				newHeight += entry->resizeGetHeight(contentWidth);
 			}
 			if (reactionsInBubble) {
 				if (!mediaDisplayed || _viewButton) {
@@ -4343,9 +4466,12 @@ int Message::resizeContentGetHeight(int newWidth) {
 bool Message::needInfoDisplay() const {
 	const auto media = this->media();
 	const auto mediaDisplayed = media ? media->isDisplayed() : false;
+	const auto check = factcheckBlock();
 	const auto entry = logEntryOriginal();
 	return entry
 		? !entry->customInfoLayout()
+		: check
+		? !check->customInfoLayout()
 		: ((mediaDisplayed && media->isBubbleBottom())
 			? !media->customInfoLayout()
 			: true);
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index 5f64193d721cb..240e1a47a43fd 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -47,6 +47,7 @@ struct LogEntryOriginal
 struct Factcheck
 : public RuntimeComponent<Factcheck, Element> {
 	std::unique_ptr<WebPage> page;
+	bool expanded = false;
 };
 
 struct PsaTooltipState : public RuntimeComponent<PsaTooltipState, Element> {
@@ -294,6 +295,7 @@ class Message final : public Element {
 	[[nodiscard]] int viewButtonHeight() const;
 
 	[[nodiscard]] WebPage *logEntryOriginal() const;
+	[[nodiscard]] WebPage *factcheckBlock() const;
 
 	[[nodiscard]] ClickHandlerPtr createGoToCommentsLink() const;
 	[[nodiscard]] ClickHandlerPtr psaTooltipLink() const;
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 0181d7da3e062..77d6fa5ea98e1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "history/view/media/history_view_web_page.h"
 
 #include "core/application.h"
+#include "countries/countries_instance.h"
 #include "base/qt/qt_key_modifiers.h"
 #include "window/window_session_controller.h"
 #include "iv/iv_instance.h"
@@ -19,13 +20,14 @@ For license and copyright information please follow this link:
 #include "data/data_photo_media.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
-#include "history/history.h"
-#include "history/history_item_components.h"
+#include "history/view/media/history_view_media_common.h"
+#include "history/view/media/history_view_sticker.h"
 #include "history/view/history_view_cursor_state.h"
+#include "history/view/history_view_message.h"
 #include "history/view/history_view_reply.h"
 #include "history/view/history_view_sponsored_click_handler.h"
-#include "history/view/media/history_view_media_common.h"
-#include "history/view/media/history_view_sticker.h"
+#include "history/history.h"
+#include "history/history_item_components.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "menu/menu_sponsored.h"
@@ -36,13 +38,16 @@ For license and copyright information please follow this link:
 #include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
 
 constexpr auto kMaxOriginalEntryLines = 8192;
+constexpr auto kFactcheckCollapsedLines = 3;
 constexpr auto kStickerSetLines = 3;
+constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 
 [[nodiscard]] int ArticleThumbWidth(not_null<PhotoData*> thumb, int height) {
 	const auto size = thumb->location(Data::PhotoSize::Thumbnail);
@@ -148,6 +153,39 @@ constexpr auto kStickerSetLines = 3;
 	});
 }
 
+[[nodiscard]] ClickHandlerPtr AboutFactcheckClickHandler(QString iso2) {
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		const auto controller = my.sessionWindow.get();
+		const auto show = my.show
+			? my.show
+			: controller
+			? controller->uiShow()
+			: nullptr;
+		if (show) {
+			const auto name = Countries::Instance().countryNameByISO2(iso2);
+			const auto use = name.isEmpty() ? iso2 : name;
+			show->showToast({
+				.text = { tr::lng_factcheck_about(tr::now, lt_country, use) },
+				.duration = kFactcheckAboutDuration,
+			});
+		}
+	});
+}
+
+[[nodiscard]] ClickHandlerPtr ToggleFactcheckClickHandler(
+		not_null<Element*> view) {
+	const auto weak = base::make_weak(view);
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		if (const auto strong = weak.get()) {
+			if (const auto factcheck = strong->Get<Factcheck>()) {
+				factcheck->expanded = !factcheck->expanded;
+				strong->history()->owner().requestViewResize(strong);
+			}
+		}
+	});
+}
+
 [[nodiscard]] TextWithEntities PageToPhrase(not_null<WebPageData*> page) {
 	const auto type = page->type;
 	const auto text = Ui::Text::Upper(page->iv
@@ -234,32 +272,55 @@ WebPage::WebPage(
 : Media(parent)
 , _st(st::historyPagePreview)
 , _data(data)
-, _sponsoredData([&]() -> std::optional<SponsoredData> {
-	if (!(flags & MediaWebPageFlag::Sponsored)) {
-		return std::nullopt;
-	}
-	const auto &session = _parent->data()->history()->session();
-	const auto details = session.sponsoredMessages().lookupDetails(
-		_parent->data()->fullId());
-	auto result = std::make_optional<SponsoredData>();
-	result->buttonText = details.buttonText;
-	result->isLinkInternal = details.isLinkInternal;
-	result->backgroundEmojiId = details.backgroundEmojiId;
-	result->colorIndex = details.colorIndex;
-	result->canReport = details.canReport;
-	return result;
-}())
+, _flags(flags)
 , _siteName(st::msgMinWidth - _st.padding.left() - _st.padding.right())
 , _title(st::msgMinWidth - _st.padding.left() - _st.padding.right())
-, _description(st::msgMinWidth - _st.padding.left() - _st.padding.right())
-, _flags(flags) {
+, _description(st::msgMinWidth - _st.padding.left() - _st.padding.right()) {
 	history()->owner().registerWebPageView(_data, _parent);
 }
 
+void WebPage::setupAdditionalData() {
+	if (_flags & MediaWebPageFlag::Sponsored) {
+		_additionalData = std::make_unique<AdditionalData>(SponsoredData());
+		const auto raw = sponsoredData();
+		const auto &session = _parent->data()->history()->session();
+		const auto details = session.sponsoredMessages().lookupDetails(
+			_parent->data()->fullId());
+		raw->buttonText = details.buttonText;
+		raw->isLinkInternal = details.isLinkInternal ? 1 : 0;
+		raw->backgroundEmojiId = details.backgroundEmojiId;
+		raw->colorIndex = details.colorIndex;
+		raw->canReport = details.canReport ? 1 : 0;
+	} else if (_data->stickerSet) {
+		_additionalData = std::make_unique<AdditionalData>(StickerSetData());
+		const auto raw = stickerSetData();
+		for (const auto &sticker : _data->stickerSet->items) {
+			if (!sticker->sticker()) {
+				continue;
+			}
+			raw->views.push_back(
+				std::make_unique<Sticker>(_parent, sticker, true));
+		}
+		const auto side = std::ceil(std::sqrt(raw->views.size()));
+		const auto box = UnitedLineHeight() * kStickerSetLines;
+		const auto single = box / side;
+		for (const auto &view : raw->views) {
+			view->setWebpagePart();
+			view->initSize(single);
+		}
+	} else if (_data->type == WebPageType::Factcheck) {
+		_additionalData = std::make_unique<AdditionalData>(FactcheckData());
+	}
+}
+
 QSize WebPage::countOptimalSize() {
 	if (_data->pendingTill || _data->failed) {
 		return { 0, 0 };
 	}
+	setupAdditionalData();
+
+	const auto sponsored = sponsoredData();
+	const auto factcheck = factcheckData();
 
 	// Detect _openButtonWidth before counting paddings.
 	_openButton = Ui::Text::String();
@@ -274,12 +335,10 @@ QSize WebPage::countOptimalSize() {
 			PageToPhrase(_data),
 			kMarkupTextOptions,
 			context);
-	} else if (_sponsoredData) {
-		if (!_sponsoredData->buttonText.isEmpty()) {
-			_openButton.setText(
-				st::semiboldTextStyle,
-				Ui::Text::Upper(_sponsoredData->buttonText));
-		}
+	} else if (sponsored && !sponsored->buttonText.isEmpty()) {
+		_openButton.setText(
+			st::semiboldTextStyle,
+			Ui::Text::Upper(sponsored->buttonText));
 	}
 
 	const auto padding = inBubblePadding() + innerMargin();
@@ -296,25 +355,7 @@ QSize WebPage::countOptimalSize() {
 	}
 	const auto lineHeight = UnitedLineHeight();
 
-	if (_data->stickerSet && !_stickerSet) {
-		_stickerSet = std::make_unique<StickerSet>();
-		for (const auto &sticker : _data->stickerSet->items) {
-			if (!sticker->sticker()) {
-				continue;
-			}
-			_stickerSet->views.push_back(
-				std::make_unique<Sticker>(_parent, sticker, true));
-		}
-		const auto side = std::ceil(std::sqrt(_stickerSet->views.size()));
-		const auto box = lineHeight * kStickerSetLines;
-		const auto single = box / side;
-		for (const auto &view : _stickerSet->views) {
-			view->setWebpagePart();
-			view->initSize(single);
-		}
-	}
-
-	if (!_openl && (!_data->url.isEmpty() || _sponsoredData)) {
+	if (!_openl && (!_data->url.isEmpty() || sponsored || factcheck)) {
 		const auto original = _parent->data()->originalText();
 		const auto previewOfHiddenUrl = [&] {
 			if (_data->type == WebPageType::BotApp) {
@@ -352,28 +393,31 @@ QSize WebPage::countOptimalSize() {
 			}
 			return true;
 		}();
-		_openl = _data->iv
-			? IvClickHandler(_data, original)
-			: (previewOfHiddenUrl || UrlClickHandler::IsSuspicious(
-				_data->url))
-			? std::make_shared<HiddenUrlClickHandler>(_data->url)
-			: std::make_shared<UrlClickHandler>(_data->url, true);
-		if (_data->document
+		if (sponsored) {
+			_openl = SponsoredLink(_data->url, sponsored->isLinkInternal);
+			if (sponsored->canReport) {
+				sponsored->hint.link = AboutSponsoredClickHandler();
+			}
+		} else if (factcheck) {
+			const auto item = _parent->data();
+			if (const auto info = item->Get<HistoryMessageFactcheck>()) {
+				const auto country = info->data.country;
+				factcheck->hint.link = AboutFactcheckClickHandler(country);
+			}
+		} else if (_data->document
 			&& (_data->document->isWallPaper()
 				|| _data->document->isTheme())) {
 			_openl = std::make_shared<DocumentWrappedClickHandler>(
 				std::move(_openl),
 				_data->document,
 				_parent->data()->fullId());
-		}
-		if (_sponsoredData) {
-			_openl = SponsoredLink(
-				_data->url,
-				_sponsoredData->isLinkInternal);
-
-			if (_sponsoredData->canReport) {
-				_sponsoredData->hintLink = AboutSponsoredClickHandler();
-			}
+		} else {
+			_openl = _data->iv
+				? IvClickHandler(_data, original)
+				: (previewOfHiddenUrl || UrlClickHandler::IsSuspicious(
+					_data->url))
+				? std::make_shared<HiddenUrlClickHandler>(_data->url)
+				: std::make_shared<UrlClickHandler>(_data->url, true);
 		}
 	}
 
@@ -456,7 +500,12 @@ QSize WebPage::countOptimalSize() {
 
 	const auto siteNameHeight = _siteName.isEmpty() ? 0 : lineHeight;
 	const auto titleMinHeight = _title.isEmpty() ? 0 : lineHeight;
-	const auto descMaxLines = isLogEntryOriginal()
+	const auto factcheckMetrics = factcheck
+		? computeFactcheckMetrics(_description.minHeight())
+		: FactcheckMetrics();
+	const auto descMaxLines = factcheck
+		? factcheckMetrics.lines
+		: isLogEntryOriginal()
 		? kMaxOriginalEntryLines
 		: (3 + (siteNameHeight ? 0 : 1) + (titleMinHeight ? 0 : 1));
 	const auto descriptionMinHeight = _description.isEmpty()
@@ -517,15 +566,16 @@ QSize WebPage::countOptimalSize() {
 	if (_asArticle) {
 		minHeight = resizeGetHeight(maxWidth);
 	}
-	if (_sponsoredData && _sponsoredData->canReport) {
-		_sponsoredData->widthBeforeHint
-			= st::webPageTitleStyle.font->width(siteName);
+	if (const auto hint = hintData()) {
+		hint->widthBefore = st::webPageTitleStyle.font->width(siteName);
 		const auto &font = st::webPageSponsoredHintFont;
-		_sponsoredData->hintSize = QSize(
-			font->width(tr::lng_sponsored_message_revenue_button(tr::now))
-				+ font->height,
+		hint->text = sponsored
+			? tr::lng_sponsored_message_revenue_button(tr::now)
+			: tr::lng_factcheck_whats_this(tr::now);
+		hint->size = QSize(
+			font->width(hint->text) + font->height,
 			font->height);
-		maxWidth += _sponsoredData->hintSize.width();
+		maxWidth += hint->size.width();
 	}
 	return { maxWidth, minHeight };
 }
@@ -539,9 +589,22 @@ QSize WebPage::countCurrentSize(int newWidth) {
 	const auto innerWidth = newWidth - rect::m::sum::h(padding);
 	auto newHeight = 0;
 
-	const auto specialRightPix = (_sponsoredData || _stickerSet);
+	const auto stickerSet = stickerSetData();
+	const auto factcheck = factcheckData();
+	const auto specialRightPix = (sponsoredData() || stickerSet);
 	const auto lineHeight = UnitedLineHeight();
-	const auto linesMax = (specialRightPix || isLogEntryOriginal())
+	const auto factcheckMetrics = factcheck
+		? computeFactcheckMetrics(_description.countHeight(innerWidth))
+		: FactcheckMetrics();
+	if (factcheck) {
+		factcheck->expandable = factcheckMetrics.expandable;
+		_openl = factcheck->expandable
+			? ToggleFactcheckClickHandler(_parent)
+			: nullptr;
+	}
+	const auto linesMax = factcheck
+		? (factcheckMetrics.lines + 1)
+		: (specialRightPix || isLogEntryOriginal())
 		? kMaxOriginalEntryLines
 		: 5;
 	const auto siteNameHeight = _siteNameLines ? lineHeight : 0;
@@ -550,7 +613,7 @@ QSize WebPage::countCurrentSize(int newWidth) {
 	if (asArticle() || specialRightPix) {
 		constexpr auto kSponsoredUserpicLines = 2;
 		_pixh = lineHeight
-			* (_stickerSet
+			* (stickerSet
 				? kStickerSetLines
 				: specialRightPix
 				? kSponsoredUserpicLines
@@ -673,8 +736,14 @@ void WebPage::ensurePhotoMediaCreated() const {
 }
 
 bool WebPage::hasHeavyPart() const {
+	if (const auto stickerSet = stickerSetData()) {
+		for (const auto &part : stickerSet->views) {
+			if (part->hasHeavyPart()) {
+				return true;
+			}
+		}
+	}
 	return _photoMedia
-		|| (_stickerSet)
 		|| (_attach ? _attach->hasHeavyPart() : false);
 }
 
@@ -684,6 +753,11 @@ void WebPage::unloadHeavyPart() {
 	}
 	_description.unloadPersistentAnimation();
 	_photoMedia = nullptr;
+	if (const auto stickerSet = stickerSetData()) {
+		for (const auto &part : stickerSet->views) {
+			part->unloadHeavyPart();
+		}
+	}
 }
 
 void WebPage::draw(Painter &p, const PaintContext &context) const {
@@ -704,22 +778,22 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 	auto tshift = inner.top();
 	auto paintw = inner.width();
 
-	const auto asSponsored = (!!_sponsoredData);
+	const auto sponsored = sponsoredData();
 
 	const auto selected = context.selected();
 	const auto view = parent();
 	const auto from = view->data()->contentColorsFrom();
-	const auto colorIndex = (asSponsored && _sponsoredData->colorIndex)
-		? _sponsoredData->colorIndex
+	const auto colorIndex = (sponsored && sponsored->colorIndex)
+		? sponsored->colorIndex
 		: from
 		? from->colorIndex()
 		: view->colorIndex();
 	const auto cache = context.outbg
 		? stm->replyCache[st->colorPatternIndex(colorIndex)].get()
 		: st->coloredReplyCache(selected, colorIndex).get();
-	const auto backgroundEmojiId = (asSponsored
-			&& _sponsoredData->backgroundEmojiId)
-		? _sponsoredData->backgroundEmojiId
+	const auto backgroundEmojiId = (sponsored
+		&& sponsored->backgroundEmojiId)
+		? sponsored->backgroundEmojiId
 		: from
 		? from->backgroundEmojiId()
 		: DocumentId();
@@ -755,8 +829,8 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 	}
 
 	auto lineHeight = UnitedLineHeight();
-	if (_stickerSet) {
-		const auto viewsCount = _stickerSet->views.size();
+	if (const auto stickerSet = stickerSetData()) {
+		const auto viewsCount = stickerSet->views.size();
 		const auto box = _pixh;
 		const auto topLeft = QPoint(inner.left() + paintw - box, tshift);
 		const auto side = std::ceil(std::sqrt(viewsCount));
@@ -767,7 +841,7 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 				if (viewsCount <= index) {
 					break;
 				}
-				const auto &view = _stickerSet->views[index];
+				const auto &view = stickerSet->views[index];
 				const auto size = view->countOptimalSize();
 				const auto offsetX = (single - size.width()) / 2.;
 				const auto offsetY = (single - size.height()) / 2.;
@@ -822,7 +896,7 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 				st->msgSelectOverlay(),
 				st->msgSelectOverlayCorners(Ui::CachedCornerRadius::Small));
 		}
-		if (!asSponsored) {
+		if (!sponsored) {
 			// Ignore photo width in sponsored messages,
 			// as its width only affects the title.
 			paintw -= pw + st::webPagePhotoDelta;
@@ -850,35 +924,31 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			endskip,
 			false,
 			context.selection);
-		if (asSponsored
-			&& _sponsoredData->canReport
-			&& (paintw >
-					_sponsoredData->widthBeforeHint
-						+ _sponsoredData->hintSize.width())) {
-			if (_sponsoredData->hintRipple) {
-				_sponsoredData->hintRipple->paint(
-					p,
-					_sponsoredData->lastHintPos.x(),
-					_sponsoredData->lastHintPos.y(),
-					width(),
-					&cache->bg);
-				if (_sponsoredData->hintRipple->empty()) {
-					_sponsoredData->hintRipple = nullptr;
-				}
-			}
-
+		const auto hint = hintData();
+		if (hint && (paintw > hint->widthBefore + hint->size.width())) {
 			auto color = cache->icon;
 			color.setAlphaF(color.alphaF() * 0.15);
 
 			const auto height = st::webPageSponsoredHintFont->height;
 			const auto radius = height / 2;
 
-			_sponsoredData->lastHintPos = QPointF(
-				radius + inner.left() + _sponsoredData->widthBeforeHint,
+			hint->lastPosition = QPointF(
+				radius + inner.left() + hint->widthBefore,
 				tshift + (_siteName.style()->font->height - height) / 2.);
-			const auto rect = QRectF(
-				_sponsoredData->lastHintPos,
-				_sponsoredData->hintSize);
+
+			if (hint->ripple) {
+				hint->ripple->paint(
+					p,
+					hint->lastPosition.x(),
+					hint->lastPosition.y(),
+					width(),
+					&cache->bg);
+				if (hint->ripple->empty()) {
+					hint->ripple = nullptr;
+				}
+			}
+
+			const auto rect = QRectF(hint->lastPosition, hint->size);
 			auto hq = PainterHighQualityEnabler(p);
 			p.setPen(Qt::NoPen);
 			p.setBrush(color);
@@ -887,10 +957,7 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			p.setPen(cache->icon);
 			p.setBrush(Qt::NoBrush);
 			p.setFont(st::webPageSponsoredHintFont);
-			p.drawText(
-				rect,
-				tr::lng_sponsored_message_revenue_button(tr::now),
-				style::al_center);
+			p.drawText(rect, hint->text, style::al_center);
 		}
 		tshift += lineHeight;
 
@@ -901,7 +968,7 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 		const auto endskip = _title.hasSkipBlock()
 			? _parent->skipBlockWidth()
 			: 0;
-		const auto titleWidth = asSponsored
+		const auto titleWidth = sponsored
 			? (paintw - _pixh - st::webPagePhotoDelta)
 			: paintw;
 		_title.drawLeftElided(
@@ -1051,16 +1118,38 @@ bool WebPage::asArticle() const {
 	return _asArticle && (_data->photo != nullptr);
 }
 
+WebPage::StickerSetData *WebPage::stickerSetData() const {
+	return std::get_if<StickerSetData>(_additionalData.get());
+}
+
+WebPage::SponsoredData *WebPage::sponsoredData() const {
+	return std::get_if<SponsoredData>(_additionalData.get());
+}
+
+WebPage::FactcheckData *WebPage::factcheckData() const {
+	return std::get_if<FactcheckData>(_additionalData.get());
+}
+
+WebPage::HintData *WebPage::hintData() const {
+	if (const auto sponsored = sponsoredData()) {
+		return sponsored->hint.link ? &sponsored->hint : nullptr;
+	} else if (const auto factcheck = factcheckData()) {
+		return factcheck->hint.link ? &factcheck->hint : nullptr;
+	}
+	return nullptr;
+}
+
 TextState WebPage::textState(QPoint point, StateRequest request) const {
 	auto result = TextState(_parent);
 
 	if (width() < rect::m::sum::h(st::msgPadding) + 1) {
 		return result;
 	}
+	const auto sponsored = sponsoredData();
 	const auto bubble = _attach ? _attach->bubbleMargins() : QMargins();
 	const auto full = Rect(currentSize());
 	auto outer = full - inBubblePadding();
-	if (_sponsoredData) {
+	if (sponsored) {
 		outer.translate(0, st::msgDateFont->height);
 	}
 	const auto inner = outer - innerMargin();
@@ -1175,16 +1264,15 @@ TextState WebPage::textState(QPoint point, StateRequest request) const {
 			}
 		}
 	}
-	if ((!result.link || _sponsoredData) && outer.contains(point)) {
+	if ((!result.link || sponsored) && outer.contains(point)) {
 		result.link = _openl;
 	}
-	if (_sponsoredData && _sponsoredData->canReport) {
-		const auto contains = QRectF(
-			_sponsoredData->lastHintPos,
-			_sponsoredData->hintSize).contains(point
-				- QPoint(0, st::msgDateFont->height));
-		if (contains) {
-			result.link = _sponsoredData->hintLink;
+	if (const auto hint = hintData()) {
+		const auto check = point
+			- QPoint(0, sponsored ? st::msgDateFont->height : 0);
+		const auto hintRect = QRectF(hint->lastPosition, hint->size);
+		if (hintRect.contains(check)) {
+			result.link = hint->link;
 		}
 	}
 	_lastPoint = point - outer.topLeft();
@@ -1256,25 +1344,25 @@ void WebPage::clickHandlerActiveChanged(
 void WebPage::clickHandlerPressedChanged(
 		const ClickHandlerPtr &p,
 		bool pressed) {
-	if (_sponsoredData && _sponsoredData->hintLink == p) {
+	const auto hint = hintData();
+	if (hint && hint->link == p) {
 		if (pressed) {
-			if (!_sponsoredData->hintRipple) {
+			if (!hint->ripple) {
 				const auto owner = &parent()->history()->owner();
-				auto ripple = std::make_unique<Ui::RippleAnimation>(
+				hint->ripple = std::make_unique<Ui::RippleAnimation>(
 					st::defaultRippleAnimation,
 					Ui::RippleAnimation::RoundRectMask(
-						_sponsoredData->hintSize,
+						hint->size,
 						_st.radius),
 					[=] { owner->requestViewRepaint(parent()); });
-				_sponsoredData->hintRipple = std::move(ripple);
 			}
 			const auto full = Rect(currentSize());
 			const auto outer = full - inBubblePadding();
-			_sponsoredData->hintRipple->add(_lastPoint
+			hint->ripple->add(_lastPoint
 				+ outer.topLeft()
-				- _sponsoredData->lastHintPos.toPoint());
-		} else if (_sponsoredData->hintRipple) {
-			_sponsoredData->hintRipple->lastStop();
+				- hint->lastPosition.toPoint());
+		} else if (hint->ripple) {
+			hint->ripple->lastStop();
 		}
 		return;
 	}
@@ -1387,6 +1475,19 @@ bool WebPage::isLogEntryOriginal() const {
 	return _parent->data()->isAdminLogEntry() && _parent->media() != this;
 }
 
+WebPage::FactcheckMetrics WebPage::computeFactcheckMetrics(
+		int fullHeight) const {
+	const auto possible = fullHeight / st::normalFont->height;
+	const auto expandable = (possible > kFactcheckCollapsedLines + 1);
+	const auto check = _parent->Get<Factcheck>();
+	const auto expanded = check && check->expanded;
+	const auto allowExpanding = (expanded || !expandable);
+	return {
+		.lines = allowExpanding ? possible : kFactcheckCollapsedLines,
+		.expandable = expandable,
+	};
+}
+
 int WebPage::bottomInfoPadding() const {
 	if (!isBubbleBottom()) {
 		return 0;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
index 86f7ec817099e..47cba266c02df 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -101,6 +101,40 @@ class WebPage : public Media {
 	~WebPage();
 
 private:
+	struct FactcheckMetrics {
+		int lines = 0;
+		bool expandable = false;
+	};
+	struct HintData {
+		QSize size;
+		QPointF lastPosition;
+		QString text;
+		int widthBefore = 0;
+		std::unique_ptr<Ui::RippleAnimation> ripple;
+		ClickHandlerPtr link;
+	};
+	struct StickerSetData {
+		std::vector<std::unique_ptr<Sticker>> views;
+	};
+	struct SponsoredData {
+		QString buttonText;
+
+		uint64 backgroundEmojiId = 0;
+		uint8 colorIndex : 6 = 0;
+		uint8 isLinkInternal : 1 = 0;
+		uint8 canReport : 1 = 0;
+
+		HintData hint;
+	};
+	struct FactcheckData {
+		HintData hint;
+		bool expandable = false;
+	};
+	using AdditionalData = std::variant<
+		StickerSetData,
+		SponsoredData,
+		FactcheckData>;
+
 	void playAnimation(bool autoplay) override;
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
@@ -124,36 +158,26 @@ class WebPage : public Media {
 		const ClickHandlerPtr &link) const;
 	[[nodiscard]] bool asArticle() const;
 
+	[[nodiscard]] StickerSetData *stickerSetData() const;
+	[[nodiscard]] SponsoredData *sponsoredData() const;
+	[[nodiscard]] FactcheckData *factcheckData() const;
+	[[nodiscard]] HintData *hintData() const;
+
+	[[nodiscard]] FactcheckMetrics computeFactcheckMetrics(
+		int fullHeight) const;
+
+	void setupAdditionalData();
+
 	const style::QuoteStyle &_st;
 	const not_null<WebPageData*> _data;
+	const MediaWebPageFlags _flags;
+
 	std::vector<std::unique_ptr<Data::Media>> _collage;
 	ClickHandlerPtr _openl;
 	std::unique_ptr<Media> _attach;
 	mutable std::shared_ptr<Data::PhotoMedia> _photoMedia;
 	mutable std::unique_ptr<Ui::RippleAnimation> _ripple;
 
-	struct StickerSet final {
-		std::vector<std::unique_ptr<Sticker>> views;
-	};
-
-	std::unique_ptr<StickerSet> _stickerSet;
-
-	struct SponsoredData final {
-		QString buttonText;
-		bool isLinkInternal = false;
-
-		uint64 backgroundEmojiId = 0;
-		uint8 colorIndex : 6 = 0;
-
-		bool canReport = false;
-		QSize hintSize;
-		QPointF lastHintPos;
-		int widthBeforeHint = 0;
-		std::unique_ptr<Ui::RippleAnimation> hintRipple;
-		ClickHandlerPtr hintLink;
-	};
-	mutable std::optional<SponsoredData> _sponsoredData;
-
 	int _dataVersion = -1;
 	int _siteNameLines = 0;
 	int _descriptionLines = 0;
@@ -172,7 +196,7 @@ class WebPage : public Media {
 	int _pixw = 0;
 	int _pixh = 0;
 
-	const MediaWebPageFlags _flags;
+	std::unique_ptr<AdditionalData> _additionalData;
 
 };
 

From a87a221f26c89ec024291f09775724bb05dc1b11 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 23 May 2024 17:22:07 +0400
Subject: [PATCH 242/400] Force red for factcheck.

---
 .../SourceFiles/history/view/media/history_view_web_page.cpp  | 4 +++-
 1 file changed, 3 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 77d6fa5ea98e1..a4cd1d66ad986 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -783,7 +783,9 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 	const auto selected = context.selected();
 	const auto view = parent();
 	const auto from = view->data()->contentColorsFrom();
-	const auto colorIndex = (sponsored && sponsored->colorIndex)
+	const auto colorIndex = factcheckData()
+		? 0 // red
+		: (sponsored && sponsored->colorIndex)
 		? sponsored->colorIndex
 		: from
 		? from->colorIndex()

From 74861a334dd2479eb26c76a78b1c37179d8fb3cc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 23 May 2024 17:50:59 +0400
Subject: [PATCH 243/400] Show expand/collapse icon in factcheck.

---
 .../view/media/history_view_web_page.cpp      | 19 ++++++++++++++++---
 .../view/media/history_view_web_page.h        |  2 ++
 Telegram/SourceFiles/ui/chat/chat.style       |  3 +++
 Telegram/codegen                              |  2 +-
 4 files changed, 22 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 a4cd1d66ad986..9c4c1ef05e02e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -598,6 +598,7 @@ QSize WebPage::countCurrentSize(int newWidth) {
 		: FactcheckMetrics();
 	if (factcheck) {
 		factcheck->expandable = factcheckMetrics.expandable;
+		factcheck->expanded = factcheckMetrics.expanded;
 		_openl = factcheck->expandable
 			? ToggleFactcheckClickHandler(_parent)
 			: nullptr;
@@ -779,11 +780,12 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 	auto paintw = inner.width();
 
 	const auto sponsored = sponsoredData();
+	const auto factcheck = factcheckData();
 
 	const auto selected = context.selected();
 	const auto view = parent();
 	const auto from = view->data()->contentColorsFrom();
-	const auto colorIndex = factcheckData()
+	const auto colorIndex = factcheck
 		? 0 // red
 		: (sponsored && sponsored->colorIndex)
 		? sponsored->colorIndex
@@ -793,8 +795,9 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 	const auto cache = context.outbg
 		? stm->replyCache[st->colorPatternIndex(colorIndex)].get()
 		: st->coloredReplyCache(selected, colorIndex).get();
-	const auto backgroundEmojiId = (sponsored
-		&& sponsored->backgroundEmojiId)
+	const auto backgroundEmojiId = factcheck
+		? DocumentId()
+		: (sponsored && sponsored->backgroundEmojiId)
 		? sponsored->backgroundEmojiId
 		: from
 		? from->backgroundEmojiId()
@@ -821,6 +824,15 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 		if (!backgroundEmojiCache->frames[0].isNull()) {
 			FillBackgroundEmoji(p, outer, false, *backgroundEmojiCache);
 		}
+	} else if (factcheck && factcheck->expandable) {
+		const auto &icon = factcheck->expanded
+			? st::factcheckIconCollapse
+			: st::factcheckIconExpand;
+		icon.paint(
+			p,
+			outer.x() + outer.width() - icon.width() - _st.padding.right(),
+			outer.y() + _st.padding.top(),
+			width());
 	}
 
 	if (_ripple) {
@@ -1487,6 +1499,7 @@ WebPage::FactcheckMetrics WebPage::computeFactcheckMetrics(
 	return {
 		.lines = allowExpanding ? possible : kFactcheckCollapsedLines,
 		.expandable = expandable,
+		.expanded = expanded,
 	};
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
index 47cba266c02df..4637adb31c11d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -104,6 +104,7 @@ class WebPage : public Media {
 	struct FactcheckMetrics {
 		int lines = 0;
 		bool expandable = false;
+		bool expanded = false;
 	};
 	struct HintData {
 		QSize size;
@@ -129,6 +130,7 @@ class WebPage : public Media {
 	struct FactcheckData {
 		HintData hint;
 		bool expandable = false;
+		bool expanded = false;
 	};
 	using AdditionalData = std::variant<
 		StickerSetData,
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 1d7361bdd2d71..6c398f2367db5 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1132,3 +1132,6 @@ effectPreviewPromoPadding: margins(4px, 6px, 4px, 6px);
 effectPreviewLoading: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
 	thickness: 2px;
 }
+
+factcheckIconExpand: icon {{ "fast_to_original-rotate_cw", historyPeer1NameFg }};
+factcheckIconCollapse: icon {{ "fast_to_original-rotate_ccw", historyPeer1NameFg }};
diff --git a/Telegram/codegen b/Telegram/codegen
index 6462cda46ec5d..0af1361240833 160000
--- a/Telegram/codegen
+++ b/Telegram/codegen
@@ -1 +1 @@
-Subproject commit 6462cda46ec5d48a9ae452ba1b6f7dfe1b6d882d
+Subproject commit 0af136124083369073b8fdaf45f0816fd2b10bad

From 493f0450b42a37ef947ce9d209603b44905596d1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 23 May 2024 22:58:09 +0400
Subject: [PATCH 244/400] Implement factcheck edition.

---
 Telegram/Resources/icons/menu/factcheck.png   | Bin 0 -> 588 bytes
 .../Resources/icons/menu/factcheck@2x.png     | Bin 0 -> 1359 bytes
 .../Resources/icons/menu/factcheck@3x.png     | Bin 0 -> 2267 bytes
 Telegram/Resources/langs/lang.strings         |   6 +-
 .../data/components/factchecks.cpp            |  61 +++++++++++++
 .../SourceFiles/data/components/factchecks.h  |  10 +++
 .../admin_log/history_admin_log_inner.cpp     |   3 +-
 .../history/history_inner_widget.cpp          |  26 ++++++
 Telegram/SourceFiles/history/history_item.cpp |  14 ++-
 Telegram/SourceFiles/history/history_item.h   |   1 +
 .../history/history_item_components.cpp       |  10 ++-
 .../history/history_item_components.h         |   9 ++
 .../history/history_item_edition.cpp          |   1 +
 .../history/history_item_edition.h            |   1 +
 .../history/view/history_view_message.cpp     |  37 ++++----
 .../ui/boxes/edit_factcheck_box.cpp           |  81 ++++++++++++++++++
 .../SourceFiles/ui/boxes/edit_factcheck_box.h |  15 ++++
 Telegram/SourceFiles/ui/chat/chat.style       |  15 ++++
 Telegram/SourceFiles/ui/menu_icons.style      |   1 +
 Telegram/cmake/td_ui.cmake                    |   2 +
 20 files changed, 264 insertions(+), 29 deletions(-)
 create mode 100644 Telegram/Resources/icons/menu/factcheck.png
 create mode 100644 Telegram/Resources/icons/menu/factcheck@2x.png
 create mode 100644 Telegram/Resources/icons/menu/factcheck@3x.png
 create mode 100644 Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
 create mode 100644 Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h

diff --git a/Telegram/Resources/icons/menu/factcheck.png b/Telegram/Resources/icons/menu/factcheck.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9115a4cf1bc6bf28f2a3011f43af86c5ef4190e
GIT binary patch
literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000;O000;W0ssI2ZxyPq00009a7bBm000XU
z000XU0RWnu7ytkP{z*hZR5*>@kxQ#_VI0M`_a&E2$$enN$m9%&v8j|xij*%Pr5!0>
z0Oc|<Fju~TiHr<oCyC^;OG=rDXlLNkdIwKQ&URj=XN}hSKfk@6%ciJbtG}-nd_G?;
zm$TVyv)PQM=~OC}OeW9g^K?4>pgxgE02qx%JkJ9Fa5|mF<1v6_GWkIffNHf$d>{}A
z27|<x%Vhv>Rah*R)oOJ(99{wY{eHb(TdmfgS~8gofW=~AGMQd627_TbodU>av%-YK
z;Q)|Mr{6g^!!Q6`E|<VsJRbk~{$8)QR;%430ES@%IFreAy<TInm|%;=Vgb-<wMdLa
zBDdSkY&Hw;Ihjn_?e_P%N~HqO>2&UsX0yq0+#~bnG3fRB#bQBxKA#^92E=bRo8@xp
zcDwH+$8j2sM))`$j|YHOt0mFtbOK;mw%hIUJTDT79$}3}1HkY1-zVa`)9G{+MeTMw
z5?Pj|X?nZe%H?vkTK)7N2u416mQ*U8&*uQ5(dgq`p-?=L;cyrL$8j>5O!#(kxx8Ml
z11J`Y!URPX3Iza-M&tVi&+_~I0PJ=<iDI!>B9RdP_4NfH6bk*P;;w$bPu{XrDqSv@
z>-AcxRD3=kfZ=fXZVN?G3WcKA>j5|(kC{v+olYN*M*#hPU#V1nP()-f7#^e1X#BY1
aSLh!JF#T`ZCc07p0000<MNUMnLSTX<<Ol5l

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/factcheck@2x.png b/Telegram/Resources/icons/menu/factcheck@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcc80e45e742b71ff4077d1cde4f04e043b4ffec
GIT binary patch
literal 1359
zcmV-V1+e;wP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00009a7bBm000XU
z000XU0RWnu7ytkT0ZBwbR9J=Wm|H0OZyd*;{r@?PnA6&3=9I_<vK(?jNRepE{2Y=I
zE*x?S#UeK@c0nnpA{V=nP?ES2#f4Lv<46o6VvL0u8lV5g^Y5GAHnZ=3^RIt-U4A~#
z=l#6DJ)h^WA@su!KYTBLTUN$oGF@F=UteE!I-Oq1#>R%tW>cwDjYjjw_RJt9C1q}I
z?&0C#`T1F)P;_*3L`FtZsZ=VJ%H?v!VzFE<*J`!*_xJPj^Xcj7-|MElyc~?7P$(1%
zh0#=Xb@g|-2?z+lbDW%<l$4aDrlxjwc3xj!f1F;WQgwHC^ZERuqN0O?0~`zt4Ez>D
z0|Ns9pw()Ff`W)3i^byccp{NVBoguYd^Vd+r2PE+?(gpbKq8S?-wm71etCHTfWE#y
z^Q$^KIsoAH_0`+k+nR1XJUrId*8$-D{oTjM$NWN1Pfwjr2LM}JTMP!n3RY}wZG}Q1
z(G6u~Wn>jfN=k^%D=sd!v$M0@O@4m9TrMXXwz09%GM)PRdP3yr=%~23*b)`u%K%_$
zX(>55*)lhngoK2Jg#|*eqN0Lay_c64Ui-ttLn|I`si~>^`}^3FudgqO%F4=00MKYO
zVPRp`a)Sv83DIaY0MO9TV06G=Mx#t76Ct#-v$MImY1zbfc6LcgNsf+=dhzY;ZK+g>
z5aMt+Bn;tuk;CE8XfzAlP$-nKv9Xz%8Iee&mvVM?#%I#w<0A>h=;&y?(uIYE78sI9
zB)Gh)s!A`FmzRfAiHV8iMDeDWnwlc(rmd|FPdPX^XqX)x9R+}ul@+qGsHUa{0OWGH
zv$M1LRb^#m*v;(hEQLbR%i7!9@9pgYfZ<XS81Es3(CzIlLdf0S-NnVlOg937ptrXd
zAtaSbc|0Bf=nbIJXdWIO2%)>XJJN>ebUH#vrBbQY>W^^;2ZzDI!QtUyEKLv}A3ruW
zh7gj=<w;3NMtfGRR$pCR5#r=nUS0-(@$qrJIFrf5iz1WB{QdoLFf1$#zXfh?ZcN|4
zLqkIVu(7dWxS*zpi;Kgv=H%oUW-BTxa8{{Q`uqF4xVW63p96qSr;CV)Fs=OS*DqX~
zl9EEgP)kb-04Nj+2L}hE0}2WXu<rT!IdL2Cc)Tx_ot&KTV^=H|8y#T0hp1F4Lg@1H
z^6BZx=m3dCl9`$L{{HUi>4{&crKP146BAz=dU$v^J3Aw$Fc-XgpP!$jqM}R;i;0Oj
zJv{}0y1F_umAPE5R;wjdf)GM177I7&>FH^1Zmx+2WH1<^p`m8V3Iu}V<6{7Ldwcur
zF8h@1>}=xsvbnjLm6b)V{&zAmGVmi9BNPfPQAtlv$D1G1-rjDR8?jhSh^(!x@%enq
zbp9nREp20C1IvB(h%rHJZ7r_d-Q5)k1b<|Oz|qlhad8pr`uX{pU&!HbaMkMSDycj1
zYv^?P)6)|G^!N80W}TdzjJ}+@y1D@1<>iINVp-D-rl+R|tAE^9At51MU0sKVhsVdq
zy}iBR;o(FoI5_z6@$s{7umWCQUc`;j)YK#t3WtY>-`?KfcSc4=ghF9`ef`D71&&zx
zXX{6Db92D}l}gpx+S=06qEspkv-$b?-{l4q8yh=0IeB$;rB<tDGFfwTGw}xli^UR&
zL^7F7tyU|Q%IWFp`1ttmbwl9h=Eh(!jGo{W3WdpJy1BXiM^=9L;fMb_{{Td-S0Me0
REc*Ze002ovPDHLkV1hl0p%(xE

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/factcheck@3x.png b/Telegram/Resources/icons/menu/factcheck@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..139e30eb89f6be5ae35d4a1e93a98ba17ef4a519
GIT binary patch
literal 2267
zcmV<12qgE3P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00009a7bBm000XU
z000XU0RWnu7ytkWjY&j7RA_<inpsQ}Q5VN=7pMh<N};le5m{7F6A2H-8U-REvRIY~
z8frk)KyZywqfe4(Vo;D(l8Qx&C=D8nC}L1#u`#42(h|Z}P?Cz$U>8}WrPJ?WzVAA+
zw52njzV!EWJ3aS*&Y8LQ&bc!KfDIcqY}l}2!^Yo&M4%RpM%%xC|CTLV7z~C^r&B7G
zB9TZUkt}H(5)#5@vpqdMX*8Njr5YR@Y;JCznVBIl9%6`(k8f*hGyaK2qiJYpNJ~re
z^72}>Y89PM_wevYPEHmIg-WGzfpKSNXG%)Szs}=Nva_>wI-PNO<Z`)GDwRs5!^6WS
z%n$@QckbN3&gOr_#Kd5O(`vP1vAD0V&vdFrqtRe63=IuQBod8AgFVjSaQ<~p0001b
zdU{|?b#-+S5fLmF%irHWIXPJ%5PbjseQ`=krSkFP$48GI-Mo3Tx3~A+y?d*ws^Gse
znGAnacoz>2ha(gUsZ=Te;MJ>Fsi~<yfByWfP9lYbgoK5K1qTOvdU^r?zJ2@F+uJLV
zNMte@f*{b6PNxe5f~2G*0D!?@ICkvVqeqW$#)ga5)>ia1&&|#4+_@8v)Yh$A;h5~`
z=pZUWYlw@BgX8Dr%a`~Cg+d{meu;^R_yw(D)22;BLqjmJ*w|S7n&IK$Q1Hu_FWa_l
z!>_qAcJ12L-`@{|sIRXlO1ZYS7Rn9}4@X8u5~Xa0sHiADpa1LEFX(<?V8GqoohW@*
zSJ&R&UMP+rh(I7XaNqz@`b!WI5%KQbJ8Vkm(i|8VNUWoc8#jLX^a<-lr_;5zw#LN7
z5bFp408XDiJv}|W;C9r|(BR?WLA)~n+}zyi>gwj_=dtc)XJ;>8zD%T>w6rvX!GQH4
z7K@J`KTf2Nr8sir$j6T#7o5$^%uHg`84Skg=qS`}ZEZzwqkoM<hYr1Y^9BYmHa14g
zFv-cufugmwwKN)y0MQjfCX=hHt6>=D&z~niR3H$ba^vIUetv!gC|ZS|pWpcSI2y^b
zXV1*qlg(N<J3FHdiA3`G^Jkp#Er*MX3yEZ^a2*>P6NyC7m`pYkx%tFksY;<x?Ck6;
zi*se1JbCi<>(>t+JXpPY^>Q{;DivmqAc*O+U=eU|D-?==fB?L5i{Ns(@ZOk_k+Gba
zzrX+3*cfW|^yyQxvgWVY`}gnBhL@KY;T1q~ax#y{Ll-0jK_(|Bm$TfrZ{NCg>(KUx
z4<88d?ds|ZmwS;&<lx{yfG7X}05+RFF);zxy28T3<pvmqLTPDffddC-h?nBxVpLSE
zR`1xcgAmPtfB>0H2D7TKuQxHlf`WqJl2}<;Nk{+y01z1&38w*<%f&C~?(W{z)djQa
z=;&avSSIWf6BE(WN3YjgxKA@b#{d8dg<@)I3T^xN_*l}#1T-40rluw=EDZhG*VlLW
z@ZpJx2@_p>eSOjOeRg*C>({TAc(Euk0012QbUNL_F3V9~ULF+{g|-I=2NM$$&Blr?
zcd$=NOhC27$kEZ!-rgQ<E0xOS%$Q8(#ful|bb3WaMSp+)k~X()-GWuDR;$g*${H9L
zFdG28o_2P21g>5nCnpC%5Tntk)9Iq4qn9%)EiFao%;@MSo6TNqaP{g{IIm`AX5!-F
zEDV6nW=~B`p&hSWxngA+3!qRa?d|QTs9Y{LG0RIzN?_b-wK^do0sC)ub~gN1uh*|=
z_u=g9ER{;pzGAT$|8xKVfbj5e^l}-E#=Cd#ny~ct_7;gm*y!P&EhQzzh{1~eVt#%;
z+805P`1pA1a`}V8!a`JWYHG^tlf(7v*EcjYzyuHkIdkR=hr^kioP-C9i;JxYgUx2c
zE&Toa_pM6hPvEmYkw^q9eG{x%v*zK$huG_;)oS5Sp-^aDCCy|q;c#ebYBE~{n_uqX
zfL16J)6>&t?NusOR#sL;MFskkN~OY*qOGkhBO^nv*P9htj7Fo8%jIaBMx&YCwwUM1
zlPBnTlF4KY2E+1>d3kx*dDYq3$z(FE4ui>Lc6WE9QjLv`R_pxc#*G^=xa{og74^-{
z%~dEAdcD5Az1?)tWR|R~EEq;nQ4t=g{}LJ+3JXP*N_FbgsTEzf?c28>Ja`b#6IEwt
z=giDZxctn|&*Oai@f#kGhaFU1U0r9-p2c|uEP=^n=H}*hc6MUD*VNPyuzf~xadE*u
z07L2N=}AvdC&s~2q@|_7Nd;+dZ+CNZBhrnNlT%Sq5xi4F?%cUUzyh@h?8HVv5TvxU
z)WyYxa9;ob5EvL(Qc|+u?d!dJ_lWgUP*8x?S1Of!K0i1(m{>1M;N|6oEenlC<B1a|
zh!W4p$iOOBR#tA<uz@IXi#T)U3>=wiwHp5h6ae7i;h|EgU{;qdUBa(v4YzOKhCvh*
z6yO)UdGjU|EGsL+FK8uXGI?-t5RF5jP<VTLFK0<2k$il7e0_Z>6v}coEEa2IWCT?k
z85#K}FA08wt(&f0ySCWC-rhbTA%Vx^b$545rBXhh&*5;E+)!P(Z~;o?=jZ?bV>gMX
zrze~h8jXg_<-(v@ELLi2>WddI7Q9<C8ja1(&FSgsYuBztE$!{?Q&Ljk*Hs#g2K^}H
zAA`N;==J)yZ{OzS<&~G0FL>R$7^zfRR#tZX`t_!!rn$K}c$}D05I<BZwXw0$bPgJg
zMj#OI`FyonZQ8QAxtW-qKOs0dIaO6vVb3}?B_5BrXU`ronM@*)cJJO@US9s=$B)I9
zI-Rbzwsu7owh0LP5R*co#Ky*Qx!j<jAO{BrgTbKHYFk=b>g(&pVzJR^#2SZ&h9)H?
zMMp<FIXT(c*-cMR%jNRw>gwmupU=<F6A}-RUznmeIyy2K482}&`r$4BfJ7p>xw)ZV
pm|C(ow_(GE4I4IW*s$?;`40p^KZZY1ozegR002ovPDHLkV1f$zR09A2

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6b28b450ee06f..efb548724efe5 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3217,6 +3217,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_reply_msg" = "Reply";
 "lng_context_quote_and_reply" = "Quote & Reply";
 "lng_context_edit_msg" = "Edit";
+"lng_context_add_factcheck" = "Add Fact Check";
+"lng_context_edit_factcheck" = "Edit Fact Check";
 "lng_context_forward_msg" = "Forward Message";
 "lng_context_send_now_msg" = "Send now";
 "lng_context_reschedule" = "Reschedule";
@@ -3287,12 +3289,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_context_spoiler_effect" = "Hide with Spoiler";
 "lng_context_disable_spoiler" = "Remove Spoiler";
-"lng_context_add_factcheck" = "Add Fact Check";
 
 "lng_factcheck_title" = "Fact Check";
 "lng_factcheck_placeholder" = "Add Facts or Context";
 "lng_factcheck_whats_this" = "what's this?";
 "lng_factcheck_about" = "This clarification was provided by a fact checking agency assigned by the department of the government of your country ({country}) responsible for combatting misinformation.";
+"lng_factcheck_add_done" = "Fact check added.";
+"lng_factcheck_edit_done" = "Fact check edited.";
+"lng_factcheck_remove_done" = "Fact check removed.";
 
 "lng_translate_show_original" = "Show Original";
 "lng_translate_bar_to" = "Translate to {name}";
diff --git a/Telegram/SourceFiles/data/components/factchecks.cpp b/Telegram/SourceFiles/data/components/factchecks.cpp
index 0423d1d4393e9..af72d8aff9a3c 100644
--- a/Telegram/SourceFiles/data/components/factchecks.cpp
+++ b/Telegram/SourceFiles/data/components/factchecks.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "data/components/factchecks.h"
 
+#include "api/api_text_entities.h"
 #include "apiwrap.h"
 #include "base/random.h"
 #include "data/data_session.h"
@@ -17,6 +18,7 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "history/history_item_components.h"
 #include "lang/lang_keys.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 
 namespace Data {
@@ -135,4 +137,63 @@ std::unique_ptr<HistoryView::WebPage> Factchecks::makeMedia(
 		MediaWebPageFlags());
 }
 
+bool Factchecks::canEdit(not_null<HistoryItem*> item) const {
+	if (!canEdit()
+		|| !item->isRegular()
+		|| !item->history()->peer->isBroadcast()) {
+		return false;
+	}
+	const auto media = item->media();
+	if (!media || media->webpage() || media->photo()) {
+		return true;
+	} else if (const auto document = media->document()) {
+		return !document->isVideoMessage() && !document->sticker();
+	}
+	return false;
+}
+
+bool Factchecks::canEdit() const {
+	return _session->appConfig().get<bool>(u"can_edit_factcheck"_q, false);
+}
+
+int Factchecks::lengthLimit() const {
+	return _session->appConfig().get<int>(u"factcheck_length_limit"_q, 1024);
+}
+
+void Factchecks::save(
+		FullMsgId itemId,
+		TextWithEntities text,
+		Fn<void(QString)> done) {
+	const auto item = _session->data().message(itemId);
+	if (!item) {
+		return;
+	} else if (text.empty()) {
+		_session->api().request(MTPmessages_DeleteFactCheck(
+			item->history()->peer->input,
+			MTP_int(item->id.bare)
+		)).done([=](const MTPUpdates &result) {
+			_session->api().applyUpdates(result);
+			done(QString());
+		}).fail([=](const MTP::Error &error) {
+			done(error.type());
+		}).send();
+	} else {
+		_session->api().request(MTPmessages_EditFactCheck(
+			item->history()->peer->input,
+			MTP_int(item->id.bare),
+			MTP_textWithEntities(
+				MTP_string(text.text),
+				Api::EntitiesToMTP(
+					_session,
+					text.entities,
+					Api::ConvertOption::SkipLocal))
+		)).done([=](const MTPUpdates &result) {
+			_session->api().applyUpdates(result);
+			done(QString());
+		}).fail([=](const MTP::Error &error) {
+			done(error.type());
+		}).send();
+	}
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/factchecks.h b/Telegram/SourceFiles/data/components/factchecks.h
index 452706f9b076e..7054a3c571e78 100644
--- a/Telegram/SourceFiles/data/components/factchecks.h
+++ b/Telegram/SourceFiles/data/components/factchecks.h
@@ -32,7 +32,17 @@ class Factchecks final {
 		not_null<HistoryView::Message*> view,
 		not_null<HistoryMessageFactcheck*> factcheck);
 
+	[[nodiscard]] bool canEdit(not_null<HistoryItem*> item) const;
+	[[nodiscard]] int lengthLimit() const;
+
+	void save(
+		FullMsgId itemId,
+		TextWithEntities text,
+		Fn<void(QString)> done);
+
 private:
+	[[nodiscard]] bool canEdit() const;
+
 	void subscribeIfNotYet();
 	void request();
 
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 8fa440bf6b9ba..cb099afe4ec1c 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -1306,8 +1306,7 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					&& !link
 					&& (view->hasVisibleText()
 						|| mediaHasTextForCopy
-						|| (item->Has<HistoryMessageFactcheck>()
-							&& !item->Get<HistoryMessageFactcheck>()->data.text.empty())
+						|| !item->factcheckText().empty()
 						|| item->Has<HistoryMessageLogEntryOriginal>())) {
 					_menu->addAction(tr::lng_context_copy_text(tr::now), [=] {
 						copyContextText(itemId);
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 1687b50490fee..e6950859d9bc5 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -35,6 +35,7 @@ For license and copyright information please follow this link:
 #include "ui/effects/reaction_fly_animation.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_isolated_emoji.h"
+#include "ui/boxes/edit_factcheck_box.h"
 #include "ui/boxes/report_box.h"
 #include "ui/layers/generic_box.h"
 #include "ui/controls/delete_message_context_action.h"
@@ -72,6 +73,7 @@ For license and copyright information please follow this link:
 #include "api/api_who_reacted.h"
 #include "api/api_views.h"
 #include "lang/lang_keys.h"
+#include "data/components/factchecks.h"
 #include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
 #include "data/data_document.h"
@@ -2171,6 +2173,30 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				}
 			}, &st::menuIconEdit);
 		}
+		if (session->factchecks().canEdit(item)) {
+			const auto text = item->factcheckText();
+			const auto phrase = text.empty()
+				? tr::lng_context_add_factcheck(tr::now)
+				: tr::lng_context_edit_factcheck(tr::now);
+			_menu->addAction(phrase, [=] {
+				controller->show(Box(EditFactcheckBox, text, [=](
+						TextWithEntities result) {
+					const auto done = [=](QString error) {
+						controller->showToast(!error.isEmpty()
+							? error
+							: result.empty()
+							? tr::lng_factcheck_remove_done(tr::now)
+							: text.empty()
+							? tr::lng_factcheck_add_done(tr::now)
+							: tr::lng_factcheck_edit_done(tr::now));
+					};
+					session->factchecks().save(
+						itemId,
+						result,
+						crl::guard(controller, done));
+				}));
+			}, &st::menuIconFactcheck);
+		}
 		const auto pinItem = (item->canPin() && item->isPinned())
 			? item
 			: groupLeaderOrSelf(item);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 3a2ed484a5679..30cc8a9c3f9fd 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1508,14 +1508,18 @@ void HistoryItem::setFactcheck(MessageFactcheck info) {
 	} else {
 		AddComponents(HistoryMessageFactcheck::Bit());
 		const auto factcheck = Get<HistoryMessageFactcheck>();
+		const auto textChanged = (factcheck->data.text != info.text);
 		if (factcheck->data.hash == info.hash
 			&& (info.needCheck || !factcheck->data.needCheck)) {
 			return;
-		} else if (factcheck->data.text != info.text
+		} else if (textChanged
 			|| factcheck->data.country != info.country
 			|| factcheck->data.hash != info.hash) {
 			factcheck->data = std::move(info);
 			factcheck->requested = false;
+			if (textChanged) {
+				factcheck->page = nullptr;
+			}
 			history()->owner().requestItemResize(this);
 		}
 	}
@@ -1526,6 +1530,13 @@ bool HistoryItem::hasUnrequestedFactcheck() const {
 	return factcheck && factcheck->data.needCheck && !factcheck->requested;
 }
 
+TextWithEntities HistoryItem::factcheckText() const {
+	if (const auto factcheck = Get<HistoryMessageFactcheck>()) {
+		return factcheck->data.text;
+	}
+	return {};
+}
+
 PeerData *HistoryItem::specialNotificationPeer() const {
 	return (mentionsMe() && !_history->peer->isUser())
 		? from().get()
@@ -1725,6 +1736,7 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 	}
 
 	applyTTL(edition.ttl);
+	setFactcheck(FromMTP(this, edition.mtpFactcheck));
 
 	finishEdition(keyboardTop);
 }
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 5a864d076daa8..3118bf3bcc859 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -208,6 +208,7 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 		const TextWithEntities &content);
 	void setFactcheck(MessageFactcheck info);
 	[[nodiscard]] bool hasUnrequestedFactcheck() const;
+	[[nodiscard]] TextWithEntities factcheckText() const;
 
 	[[nodiscard]] not_null<Data::Thread*> notificationThread() const;
 	[[nodiscard]] not_null<History*> history() const {
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 54e42a16eea5c..fd1a04942945e 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -1065,6 +1065,12 @@ HistoryMessageLogEntryOriginal::~HistoryMessageLogEntryOriginal() = default;
 MessageFactcheck FromMTP(
 		not_null<HistoryItem*> item,
 		const tl::conditional<MTPFactCheck> &factcheck) {
+	return FromMTP(&item->history()->session(), factcheck);
+}
+
+MessageFactcheck FromMTP(
+		not_null<Main::Session*> session,
+		const tl::conditional<MTPFactCheck> &factcheck) {
 	auto result = MessageFactcheck();
 	if (!factcheck) {
 		return result;
@@ -1074,9 +1080,7 @@ MessageFactcheck FromMTP(
 		const auto &data = text->data();
 		result.text = {
 			qs(data.vtext()),
-			Api::EntitiesFromMTP(
-				&item->history()->session(),
-				data.ventities().v),
+			Api::EntitiesFromMTP(session, data.ventities().v),
 		};
 	}
 	if (const auto country = data.vcountry()) {
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index fa7ffbf3a99f5..906fe18cebf63 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -17,6 +17,7 @@ For license and copyright information please follow this link:
 
 struct WebPageData;
 class VoiceSeekClickHandler;
+class ReplyKeyboard;
 
 namespace Ui {
 struct ChatPaintContext;
@@ -31,6 +32,7 @@ struct GeometryDescriptor;
 namespace Data {
 class Session;
 class Story;
+class SavedSublist;
 } // namespace Data
 
 namespace Media::Player {
@@ -47,6 +49,10 @@ class Document;
 class TranscribeButton;
 } // namespace HistoryView
 
+namespace style {
+struct BotKeyboardButton;
+} // namespace style
+
 struct HistoryMessageVia : public RuntimeComponent<HistoryMessageVia, HistoryItem> {
 	void create(not_null<Data::Session*> owner, UserId userId);
 	void resize(int32 availw) const;
@@ -579,6 +585,9 @@ struct MessageFactcheck {
 [[nodiscard]] MessageFactcheck FromMTP(
 	not_null<HistoryItem*> item,
 	const tl::conditional<MTPFactCheck> &factcheck);
+[[nodiscard]] MessageFactcheck FromMTP(
+	not_null<Main::Session*> session,
+	const tl::conditional<MTPFactCheck> &factcheck);
 
 struct HistoryMessageFactcheck
 : public RuntimeComponent<HistoryMessageFactcheck, HistoryItem> {
diff --git a/Telegram/SourceFiles/history/history_item_edition.cpp b/Telegram/SourceFiles/history/history_item_edition.cpp
index 4349a3c937667..d66d0cf7bc0bf 100644
--- a/Telegram/SourceFiles/history/history_item_edition.cpp
+++ b/Telegram/SourceFiles/history/history_item_edition.cpp
@@ -24,6 +24,7 @@ HistoryMessageEdition::HistoryMessageEdition(
 	replyMarkup = HistoryMessageMarkupData(message.vreply_markup());
 	mtpMedia = message.vmedia();
 	mtpReactions = message.vreactions();
+	mtpFactcheck = message.vfactcheck();
 	views = message.vviews().value_or(-1);
 	forwards = message.vforwards().value_or(-1);
 	if (const auto mtpReplies = message.vreplies()) {
diff --git a/Telegram/SourceFiles/history/history_item_edition.h b/Telegram/SourceFiles/history/history_item_edition.h
index b8f577d807ad5..a44109299b556 100644
--- a/Telegram/SourceFiles/history/history_item_edition.h
+++ b/Telegram/SourceFiles/history/history_item_edition.h
@@ -36,4 +36,5 @@ struct HistoryMessageEdition {
 	HistoryMessageRepliesData replies;
 	const MTPMessageMedia *mtpMedia = nullptr;
 	const MTPMessageReactions *mtpReactions = nullptr;
+	const MTPFactCheck *mtpFactcheck = nullptr;
 };
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 564ea3b7b6746..b860c2c5814e8 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -917,8 +917,8 @@ QSize Message::performCountOptimalSize() {
 			minHeight += st::msgPadding.top();
 			if (mediaDisplayed) minHeight += st::mediaInBubbleSkip;
 			if (entry) minHeight += st::mediaInBubbleSkip;
-			if (check) minHeight += st::mediaInBubbleSkip;
 		}
+		if (check) minHeight += st::mediaInBubbleSkip;
 		if (mediaDisplayed) {
 			// Parts don't participate in maxWidth() in case of media message.
 			if (media->enforceBubbleWidth()) {
@@ -1308,7 +1308,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 			trect.setHeight(trect.height() - entry->height());
 		}
 		if (check) {
-			trect.setHeight(trect.height() - check->height());
+			trect.setHeight(trect.height() - check->height() - st::mediaInBubbleSkip);
 		}
 		if (displayInfo) {
 			trect.setHeight(trect.height()
@@ -1371,7 +1371,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 		}
 		if (check) {
 			auto checkLeft = inner.left();
-			auto checkTop = trect.y() + trect.height();
+			auto checkTop = trect.y() + trect.height() + st::mediaInBubbleSkip;
 			p.translate(checkLeft, checkTop);
 			auto checkContext = context.translated(checkLeft, -checkTop);
 			checkContext.selection = skipTextSelection(context.selection);
@@ -1986,7 +1986,7 @@ PointState Message::pointState(QPoint point) const {
 			//}
 			if (check) {
 				auto checkHeight = check->height();
-				trect.setHeight(trect.height() - checkHeight);
+				trect.setHeight(trect.height() - checkHeight - st::mediaInBubbleSkip);
 			}
 			if (entry) {
 				auto entryHeight = entry->height();
@@ -2428,9 +2428,9 @@ TextState Message::textState(
 		}
 		if (check) {
 			auto checkHeight = check->height();
-			trect.setHeight(trect.height() - checkHeight);
+			trect.setHeight(trect.height() - checkHeight - st::mediaInBubbleSkip);
 			auto checkLeft = inner.left();
-			auto checkTop = trect.y() + trect.height();
+			auto checkTop = trect.y() + trect.height() + st::mediaInBubbleSkip;
 			if (point.y() >= checkTop && point.y() < checkTop + checkHeight) {
 				result = check->textState(
 					point - QPoint(checkLeft, checkTop),
@@ -4333,7 +4333,7 @@ int Message::resizeContentGetHeight(int newWidth) {
 		if (contentWidth == maxWidth()) {
 			if (mediaDisplayed) {
 				if (check) {
-					newHeight += check->resizeGetHeight(contentWidth);
+					newHeight += check->resizeGetHeight(contentWidth) + st::mediaInBubbleSkip;
 				}
 				if (entry) {
 					newHeight += entry->resizeGetHeight(contentWidth);
@@ -4365,24 +4365,16 @@ int Message::resizeContentGetHeight(int newWidth) {
 			if (!mediaOnTop) {
 				newHeight += st::msgPadding.top();
 				if (mediaDisplayed) newHeight += st::mediaInBubbleSkip;
-				if (check) newHeight += st::mediaInBubbleSkip;
 				if (entry) newHeight += st::mediaInBubbleSkip;
 			}
 			if (mediaDisplayed) {
 				newHeight += media->height();
-				if (check) {
-					newHeight += check->resizeGetHeight(contentWidth);
-				}
-				if (entry) {
-					newHeight += entry->resizeGetHeight(contentWidth);
-				}
-			} else {
-				if (check) {
-					newHeight += check->resizeGetHeight(contentWidth);
-				}
-				if (entry) {
-					newHeight += entry->resizeGetHeight(contentWidth);
-				}
+			}
+			if (check) {
+				newHeight += check->resizeGetHeight(contentWidth) + st::mediaInBubbleSkip;
+			}
+			if (entry) {
+				newHeight += entry->resizeGetHeight(contentWidth);
 			}
 			if (reactionsInBubble) {
 				if (!mediaDisplayed || _viewButton) {
@@ -4518,7 +4510,8 @@ void Message::refreshInfoSkipBlock() {
 				return media->storyExpired();
 			}
 			return false;
-		} else if (item->Has<HistoryMessageLogEntryOriginal>()) {
+		} else if (item->Has<HistoryMessageLogEntryOriginal>()
+			|| factcheckBlock()) {
 			return false;
 		} else if (media && media->isDisplayed() && !_invertMedia) {
 			return false;
diff --git a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
new file mode 100644
index 0000000000000..f13c3e976831c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
@@ -0,0 +1,81 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/boxes/edit_factcheck_box.h"
+
+#include "lang/lang_keys.h"
+#include "ui/widgets/fields/input_field.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+
+void EditFactcheckBox(
+		not_null<Ui::GenericBox*> box,
+		TextWithEntities current,
+		Fn<void(TextWithEntities)> save) {
+	box->setTitle(tr::lng_factcheck_title());
+
+	const auto field = box->addRow(object_ptr<Ui::InputField>(
+		box,
+		st::factcheckField,
+		Ui::InputField::Mode::NoNewlines,
+		tr::lng_factcheck_placeholder(),
+		TextWithTags{
+			current.text,
+			TextUtilities::ConvertEntitiesToTextTags(current.entities)
+		}));
+
+	enum class State {
+		Initial,
+		Changed,
+		Removed,
+	};
+	const auto state = box->lifetime().make_state<rpl::variable<State>>(
+		State::Initial);
+	field->changes() | rpl::start_with_next([=] {
+		const auto now = field->getLastText().trimmed();
+		*state = !now.isEmpty()
+			? State::Changed
+			: current.empty()
+			? State::Initial
+			: State::Removed;
+	}, field->lifetime());
+
+	state->value() | rpl::start_with_next([=](State state) {
+		box->clearButtons();
+		if (state == State::Removed) {
+			box->addButton(tr::lng_box_remove(), [=] {
+				box->closeBox();
+				save({});
+			}, st::attentionBoxButton);
+		} else if (state == State::Initial) {
+			box->addButton(tr::lng_settings_save(), [=] {
+				if (current.empty()) {
+					field->showError();
+				} else {
+					box->closeBox();
+				}
+			});
+		} else {
+			box->addButton(tr::lng_settings_save(), [=] {
+				auto result = field->getTextWithAppliedMarkdown();
+
+				box->closeBox();
+				save({
+					result.text,
+					TextUtilities::ConvertTextTagsToEntities(result.tags)
+				});
+			});
+		}
+		box->addButton(tr::lng_cancel(), [=] {
+			box->closeBox();
+		});
+	}, box->lifetime());
+
+	box->setFocusCallback([=] {
+		field->setFocusFast();
+	});
+}
diff --git a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h
new file mode 100644
index 0000000000000..f09f52eb4a31a
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h
@@ -0,0 +1,15 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/layers/generic_box.h"
+
+void EditFactcheckBox(
+	not_null<Ui::GenericBox*> box,
+	TextWithEntities current,
+	Fn<void(TextWithEntities)> save);
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 6c398f2367db5..9dbf4330389e4 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1135,3 +1135,18 @@ effectPreviewLoading: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
 
 factcheckIconExpand: icon {{ "fast_to_original-rotate_cw", historyPeer1NameFg }};
 factcheckIconCollapse: icon {{ "fast_to_original-rotate_ccw", historyPeer1NameFg }};
+factcheckField: InputField(defaultInputField) {
+	textBg: transparent;
+	textMargins: margins(0px, 0px, 0px, 4px);
+
+	placeholderFg: placeholderFg;
+	placeholderFgActive: placeholderFgActive;
+	placeholderFgError: placeholderFgActive;
+	placeholderMargins: margins(2px, 0px, 2px, 0px);
+	placeholderScale: 0.;
+	placeholderFont: normalFont;
+
+	heightMin: 24px;
+
+	font: normalFont;
+}
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index eee9919fd73f6..8f2c0f8610fab 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -153,6 +153,7 @@ menuIconTagFilter: icon{{ "menu/tag_filter", menuIconColor }};
 menuIconTagRename: icon{{ "menu/tag_rename", menuIconColor }};
 menuIconGroupsHide: icon {{ "menu/hide_members", menuIconColor }};
 menuIconFont: icon {{ "menu/fonts", menuIconColor }};
+menuIconFactcheck: icon {{ "menu/factcheck", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 0a97c6b6d8360..3c0c026a38caf 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -261,6 +261,8 @@ PRIVATE
     ui/boxes/country_select_box.h
     ui/boxes/edit_birthday_box.cpp
     ui/boxes/edit_birthday_box.h
+    ui/boxes/edit_factcheck_box.cpp
+    ui/boxes/edit_factcheck_box.h
     ui/boxes/edit_invite_link.cpp
     ui/boxes/edit_invite_link.h
     ui/boxes/rate_call_box.cpp

From d13bf19b7953ff9fc0422713941e57b94dcbe455 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 09:37:38 +0400
Subject: [PATCH 245/400] Show length limit when editing a factcheck.

---
 .../data/components/factchecks.cpp            | 17 +++++++++++
 .../SourceFiles/data/components/factchecks.h  |  9 ++++++
 .../history/history_inner_widget.cpp          | 18 +++---------
 .../view/history_view_context_menu.cpp        | 28 +++++++++++++++++++
 .../settings/business/settings_chat_intro.cpp |  2 --
 .../ui/boxes/edit_factcheck_box.cpp           |  6 ++++
 .../SourceFiles/ui/boxes/edit_factcheck_box.h |  1 +
 7 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/factchecks.cpp b/Telegram/SourceFiles/data/components/factchecks.cpp
index af72d8aff9a3c..07051dabd881d 100644
--- a/Telegram/SourceFiles/data/components/factchecks.cpp
+++ b/Telegram/SourceFiles/data/components/factchecks.cpp
@@ -20,6 +20,7 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
+#include "ui/layers/show.h"
 
 namespace Data {
 namespace {
@@ -196,4 +197,20 @@ void Factchecks::save(
 	}
 }
 
+void Factchecks::save(
+		FullMsgId itemId,
+		TextWithEntities was,
+		TextWithEntities text,
+		std::shared_ptr<Ui::Show> show) {
+	const auto done = [=](QString error) {
+		show->showToast(!error.isEmpty()
+			? error
+			: was.empty()
+			? tr::lng_factcheck_remove_done(tr::now)
+			: text.empty()
+			? tr::lng_factcheck_add_done(tr::now)
+			: tr::lng_factcheck_edit_done(tr::now));
+	};
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/factchecks.h b/Telegram/SourceFiles/data/components/factchecks.h
index 7054a3c571e78..515e52286e1d6 100644
--- a/Telegram/SourceFiles/data/components/factchecks.h
+++ b/Telegram/SourceFiles/data/components/factchecks.h
@@ -21,6 +21,10 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace Ui {
+class Show;
+} // namespace Ui
+
 namespace Data {
 
 class Factchecks final {
@@ -39,6 +43,11 @@ class Factchecks final {
 		FullMsgId itemId,
 		TextWithEntities text,
 		Fn<void(QString)> done);
+	void save(
+		FullMsgId itemId,
+		TextWithEntities was,
+		TextWithEntities text,
+		std::shared_ptr<Ui::Show> show);
 
 private:
 	[[nodiscard]] bool canEdit() const;
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index e6950859d9bc5..76fa5c46348fe 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2179,21 +2179,11 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				? tr::lng_context_add_factcheck(tr::now)
 				: tr::lng_context_edit_factcheck(tr::now);
 			_menu->addAction(phrase, [=] {
-				controller->show(Box(EditFactcheckBox, text, [=](
+				const auto limit = session->factchecks().lengthLimit();
+				controller->show(Box(EditFactcheckBox, text, limit, [=](
 						TextWithEntities result) {
-					const auto done = [=](QString error) {
-						controller->showToast(!error.isEmpty()
-							? error
-							: result.empty()
-							? tr::lng_factcheck_remove_done(tr::now)
-							: text.empty()
-							? tr::lng_factcheck_add_done(tr::now)
-							: tr::lng_factcheck_edit_done(tr::now));
-					};
-					session->factchecks().save(
-						itemId,
-						result,
-						crl::guard(controller, done));
+					const auto show = controller->uiShow();
+					session->factchecks().save(itemId, text, result, show);
 				}));
 			}, &st::menuIconFactcheck);
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index a02f4c7865d2e..3d47b358e1fab 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -39,6 +39,7 @@ For license and copyright information please follow this link:
 #include "ui/text/text_utilities.h"
 #include "ui/controls/delete_message_context_action.h"
 #include "ui/controls/who_reacted_context_action.h"
+#include "ui/boxes/edit_factcheck_box.h"
 #include "ui/boxes/report_box.h"
 #include "ui/ui_utility.h"
 #include "menu/menu_item_download_files.h"
@@ -53,6 +54,7 @@ For license and copyright information please follow this link:
 #include "boxes/sticker_set_box.h"
 #include "boxes/stickers_box.h"
 #include "boxes/translate_box.h"
+#include "data/components/factchecks.h"
 #include "data/data_photo.h"
 #include "data/data_photo_media.h"
 #include "data/data_document.h"
@@ -713,6 +715,31 @@ bool AddEditMessageAction(
 	return true;
 }
 
+void AddFactcheckAction(
+		not_null<Ui::PopupMenu*> menu,
+		const ContextMenuRequest &request,
+		not_null<ListWidget*> list) {
+	const auto item = request.item;
+	if (!item || !item->history()->session().factchecks().canEdit(item)) {
+		return;
+	}
+	const auto itemId = item->fullId();
+	const auto text = item->factcheckText();
+	const auto session = &item->history()->session();
+	const auto phrase = text.empty()
+		? tr::lng_context_add_factcheck(tr::now)
+		: tr::lng_context_edit_factcheck(tr::now);
+	menu->addAction(phrase, [=] {
+		const auto limit = session->factchecks().lengthLimit();
+		const auto controller = request.navigation->parentController();
+		controller->show(Box(EditFactcheckBox, text, limit, [=](
+			TextWithEntities result) {
+			const auto show = controller->uiShow();
+			session->factchecks().save(itemId, text, result, show);
+		}));
+	}, &st::menuIconFactcheck);
+}
+
 bool AddPinMessageAction(
 		not_null<Ui::PopupMenu*> menu,
 		const ContextMenuRequest &request,
@@ -972,6 +999,7 @@ void AddTopMessageActions(
 	AddGoToMessageAction(menu, request, list);
 	AddViewRepliesAction(menu, request, list);
 	AddEditMessageAction(menu, request, list);
+	AddFactcheckAction(menu, request, list);
 	AddPinMessageAction(menu, request, list);
 }
 
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index b9fa7c68c239e..e9bc2f73ec27c 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -21,7 +21,6 @@ For license and copyright information please follow this link:
 #include "history/view/media/history_view_media_common.h"
 #include "history/view/media/history_view_sticker_player.h"
 #include "history/view/history_view_about_view.h"
-#include "history/view/history_view_context_menu.h"
 #include "history/view/history_view_element.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
@@ -168,7 +167,6 @@ class ChatIntro final : public BusinessSection<ChatIntro> {
 	return field;
 }
 
-
 rpl::producer<std::shared_ptr<StickerPlayer>> IconPlayerValue(
 		not_null<DocumentData*> sticker,
 		Fn<void()> update) {
diff --git a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
index f13c3e976831c..16a5b14afc3df 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
@@ -15,6 +15,7 @@ For license and copyright information please follow this link:
 void EditFactcheckBox(
 		not_null<Ui::GenericBox*> box,
 		TextWithEntities current,
+		int limit,
 		Fn<void(TextWithEntities)> save) {
 	box->setTitle(tr::lng_factcheck_title());
 
@@ -27,6 +28,7 @@ void EditFactcheckBox(
 			current.text,
 			TextUtilities::ConvertEntitiesToTextTags(current.entities)
 		}));
+	AddLengthLimitLabel(field, limit);
 
 	enum class State {
 		Initial,
@@ -62,6 +64,10 @@ void EditFactcheckBox(
 		} else {
 			box->addButton(tr::lng_settings_save(), [=] {
 				auto result = field->getTextWithAppliedMarkdown();
+				if (result.text.size() > limit) {
+					field->showError();
+					return;
+				}
 
 				box->closeBox();
 				save({
diff --git a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h
index f09f52eb4a31a..7eb104af3c988 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h
+++ b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h
@@ -12,4 +12,5 @@ For license and copyright information please follow this link:
 void EditFactcheckBox(
 	not_null<Ui::GenericBox*> box,
 	TextWithEntities current,
+	int limit,
 	Fn<void(TextWithEntities)> save);

From a3ef36f9f71cf7519a44660f85e391b937e001c6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 09:55:48 +0400
Subject: [PATCH 246/400] Fix build on Windows.

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

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 44326a9afbb44..127c5fd91904c 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -477,7 +477,7 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 
 			const auto &stUser = st::boostReplaceUserpic;
 			const auto peer = e.bareId
-				? _controller->session().data().peer(PeerId(e.bareId))
+				? _controller->session().data().peer(PeerId(e.bareId)).get()
 				: nullptr;
 			if (peer) {
 				content->add(object_ptr<Ui::CenterWrap<>>(

From 97a5e0c6ea3a0b06005ee3bf1bdaeaf174ed4406 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 11:23:27 +0400
Subject: [PATCH 247/400] Support limited formatting input in factcheck.

---
 .../SourceFiles/boxes/create_poll_box.cpp     |   2 +-
 .../chat_helpers/message_field.cpp            | 117 ++++++++++--------
 .../SourceFiles/chat_helpers/message_field.h  |   3 +
 .../data/components/factchecks.cpp            |  12 +-
 .../SourceFiles/data/components/factchecks.h  |   2 +-
 .../history/history_inner_widget.cpp          |   2 +-
 .../view/history_view_context_menu.cpp        |   3 +-
 .../platform/linux/main_window_linux.cpp      |  24 ++--
 .../platform/mac/main_window_mac.h            |   2 -
 .../platform/mac/main_window_mac.mm           |  48 ++++---
 .../mac/touchbar/mac_touchbar_manager.h       |   6 +-
 .../mac/touchbar/mac_touchbar_manager.mm      |  21 ++--
 .../SourceFiles/support/support_helper.cpp    |   2 +-
 .../ui/boxes/edit_factcheck_box.cpp           |   4 +-
 .../SourceFiles/ui/boxes/edit_factcheck_box.h |   7 +-
 Telegram/lib_ui                               |   2 +-
 16 files changed, 151 insertions(+), 106 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 151ab54b8eb05..46138e3fd3724 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -1044,7 +1044,7 @@ not_null<Ui::InputField*> CreatePollBox::setupSolution(
 	solution->setInstantReplaces(Ui::InstantReplaces::Default());
 	solution->setInstantReplacesEnabled(
 		Core::App().settings().replaceEmojiValue());
-	solution->setMarkdownReplacesEnabled(rpl::single(true));
+	solution->setMarkdownReplacesEnabled(true);
 	solution->setEditLinkCallback(
 		DefaultEditLinkCallback(_controller->uiShow(), solution));
 	solution->customTab(true);
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 557d0c337e48f..836459ad8a2ce 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -60,60 +60,43 @@ constexpr auto kTypesDuration = 4 * crl::time(1000);
 
 // For mention / custom emoji tags save and validate selfId,
 // ignore tags for different users.
-class FieldTagMimeProcessor final {
-public:
-	FieldTagMimeProcessor(
-		not_null<Main::Session*> _session,
-		Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji);
-
-	QString operator()(QStringView mimeTag);
-
-private:
-	const not_null<Main::Session*> _session;
-	const Fn<bool(not_null<DocumentData*>)> _allowPremiumEmoji;
-
-};
-
-FieldTagMimeProcessor::FieldTagMimeProcessor(
-	not_null<Main::Session*> session,
-	Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji)
-: _session(session)
-, _allowPremiumEmoji(allowPremiumEmoji) {
-}
-
-QString FieldTagMimeProcessor::operator()(QStringView mimeTag) {
-	const auto id = _session->userId().bare;
-	auto all = TextUtilities::SplitTags(mimeTag);
-	auto premiumSkipped = (DocumentData*)nullptr;
-	for (auto i = all.begin(); i != all.end();) {
-		const auto tag = *i;
-		if (TextUtilities::IsMentionLink(tag)
-			&& TextUtilities::MentionNameDataToFields(tag).selfId != id) {
-			i = all.erase(i);
-			continue;
-		} else if (Ui::InputField::IsCustomEmojiLink(tag)) {
-			const auto data = Ui::InputField::CustomEmojiEntityData(tag);
-			const auto emoji = Data::ParseCustomEmojiData(data);
-			if (!emoji) {
+[[nodiscard]] Fn<QString(QStringView)> FieldTagMimeProcessor(
+		not_null<Main::Session*> session,
+		Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji) {
+	return [=](QStringView mimeTag) {
+		const auto id = session->userId().bare;
+		auto all = TextUtilities::SplitTags(mimeTag);
+		auto premiumSkipped = (DocumentData*)nullptr;
+		for (auto i = all.begin(); i != all.end();) {
+			const auto tag = *i;
+			if (TextUtilities::IsMentionLink(tag)
+				&& TextUtilities::MentionNameDataToFields(tag).selfId != id) {
 				i = all.erase(i);
 				continue;
-			} else if (!_session->premium()) {
-				const auto document = _session->data().document(emoji);
-				if (document->isPremiumEmoji()) {
-					if (!_allowPremiumEmoji
-						|| premiumSkipped
-						|| !_session->premiumPossible()
-						|| !_allowPremiumEmoji(document)) {
-						premiumSkipped = document;
-						i = all.erase(i);
-						continue;
+			} else if (Ui::InputField::IsCustomEmojiLink(tag)) {
+				const auto data = Ui::InputField::CustomEmojiEntityData(tag);
+				const auto emoji = Data::ParseCustomEmojiData(data);
+				if (!emoji) {
+					i = all.erase(i);
+					continue;
+				} else if (!session->premium()) {
+					const auto document = session->data().document(emoji);
+					if (document->isPremiumEmoji()) {
+						if (!allowPremiumEmoji
+							|| premiumSkipped
+							|| !session->premiumPossible()
+							|| !allowPremiumEmoji(document)) {
+							premiumSkipped = document;
+							i = all.erase(i);
+							continue;
+						}
 					}
 				}
 			}
+			++i;
 		}
-		++i;
-	}
-	return TextUtilities::JoinTag(all);
+		return TextUtilities::JoinTag(all);
+	};
 }
 
 //bool ValidateUrl(const QString &value) {
@@ -352,7 +335,7 @@ void InitMessageFieldHandlers(
 	field->setInstantReplaces(Ui::InstantReplaces::Default());
 	field->setInstantReplacesEnabled(
 		Core::App().settings().replaceEmojiValue());
-	field->setMarkdownReplacesEnabled(rpl::single(true));
+	field->setMarkdownReplacesEnabled(true);
 	if (show) {
 		field->setEditLinkCallback(
 			DefaultEditLinkCallback(show, field, fieldStyle));
@@ -360,6 +343,42 @@ void InitMessageFieldHandlers(
 	}
 }
 
+Fn<void(not_null<Ui::InputField*>)> FactcheckFieldIniter(
+		std::shared_ptr<Main::SessionShow> show) {
+	Expects(show != nullptr);
+
+	return [=](not_null<Ui::InputField*> field) {
+		field->setTagMimeProcessor([](QStringView mimeTag) {
+			using Field = Ui::InputField;
+			auto all = TextUtilities::SplitTags(mimeTag);
+			for (auto i = all.begin(); i != all.end();) {
+				const auto tag = *i;
+				if (tag != Field::kTagBold
+					&& tag != Field::kTagItalic
+					&& (!Field::IsValidMarkdownLink(mimeTag)
+						|| TextUtilities::IsMentionLink(mimeTag))) {
+					i = all.erase(i);
+					continue;
+				}
+				++i;
+			}
+			return TextUtilities::JoinTag(all);
+		});
+		field->setInstantReplaces(Ui::InstantReplaces::Default());
+		field->setInstantReplacesEnabled(
+			Core::App().settings().replaceEmojiValue());
+		field->setMarkdownReplacesEnabled(rpl::single(
+			Ui::MarkdownEnabledState{
+				Ui::MarkdownEnabled{
+					{ Ui::InputField::kTagBold, Ui::InputField::kTagItalic }
+				}
+			}
+		));
+		field->setEditLinkCallback(DefaultEditLinkCallback(show, field));
+		InitSpellchecker(show, field);
+	};
+}
+
 void InitMessageFieldHandlers(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::InputField*> field,
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h
index 0c9d8ff853fca..1e67642a767a7 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.h
+++ b/Telegram/SourceFiles/chat_helpers/message_field.h
@@ -77,6 +77,9 @@ void InitSpellchecker(
 	not_null<Ui::InputField*> field,
 	bool skipDictionariesManager = false);
 
+[[nodiscard]] Fn<void(not_null<Ui::InputField*>)> FactcheckFieldIniter(
+	std::shared_ptr<Main::SessionShow> show);
+
 bool HasSendText(not_null<const Ui::InputField*> field);
 
 void InitMessageFieldFade(
diff --git a/Telegram/SourceFiles/data/components/factchecks.cpp b/Telegram/SourceFiles/data/components/factchecks.cpp
index 07051dabd881d..d068f81461cb2 100644
--- a/Telegram/SourceFiles/data/components/factchecks.cpp
+++ b/Telegram/SourceFiles/data/components/factchecks.cpp
@@ -199,18 +199,20 @@ void Factchecks::save(
 
 void Factchecks::save(
 		FullMsgId itemId,
-		TextWithEntities was,
+		const TextWithEntities &was,
 		TextWithEntities text,
 		std::shared_ptr<Ui::Show> show) {
-	const auto done = [=](QString error) {
+	const auto wasEmpty = was.empty();
+	const auto textEmpty = text.empty();
+	save(itemId, std::move(text), [=](QString error) {
 		show->showToast(!error.isEmpty()
 			? error
-			: was.empty()
+			: wasEmpty
 			? tr::lng_factcheck_remove_done(tr::now)
-			: text.empty()
+			: textEmpty
 			? tr::lng_factcheck_add_done(tr::now)
 			: tr::lng_factcheck_edit_done(tr::now));
-	};
+	});
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/factchecks.h b/Telegram/SourceFiles/data/components/factchecks.h
index 515e52286e1d6..a7eaca3d4023a 100644
--- a/Telegram/SourceFiles/data/components/factchecks.h
+++ b/Telegram/SourceFiles/data/components/factchecks.h
@@ -45,7 +45,7 @@ class Factchecks final {
 		Fn<void(QString)> done);
 	void save(
 		FullMsgId itemId,
-		TextWithEntities was,
+		const TextWithEntities &was,
 		TextWithEntities text,
 		std::shared_ptr<Ui::Show> show);
 
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 76fa5c46348fe..57f11e6783d1d 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2184,7 +2184,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 						TextWithEntities result) {
 					const auto show = controller->uiShow();
 					session->factchecks().save(itemId, text, result, show);
-				}));
+				}, FactcheckFieldIniter(controller->uiShow())));
 			}, &st::menuIconFactcheck);
 		}
 		const auto pinItem = (item->canPin() && item->isPinned())
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 3d47b358e1fab..b217777a5a7a1 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -69,6 +69,7 @@ For license and copyright information please follow this link:
 #include "data/data_file_origin.h"
 #include "data/data_message_reactions.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "chat_helpers/message_field.h" // FactcheckFieldIniter.
 #include "core/file_utilities.h"
 #include "core/click_handler_types.h"
 #include "base/platform/base_platform_info.h"
@@ -736,7 +737,7 @@ void AddFactcheckAction(
 			TextWithEntities result) {
 			const auto show = controller->uiShow();
 			session->factchecks().save(itemId, text, result, show);
-		}));
+		}, FactcheckFieldIniter(controller->uiShow())));
 	}, &st::menuIconFactcheck);
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index ba73e3b3aec86..ff9fddc747bdb 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -448,7 +448,7 @@ void MainWindow::updateGlobalMenuHook() {
 	auto canSelectAll = false;
 	const auto mimeData = QGuiApplication::clipboard()->mimeData();
 	const auto clipboardHasText = mimeData ? mimeData->hasText() : false;
-	auto markdownEnabled = false;
+	auto markdownState = Ui::MarkdownEnabledState();
 	if (const auto edit = qobject_cast<QLineEdit*>(focused)) {
 		canCut = canCopy = canDelete = edit->hasSelectedText();
 		canSelectAll = !edit->text().isEmpty();
@@ -464,7 +464,7 @@ void MainWindow::updateGlobalMenuHook() {
 		if (canCopy) {
 			if (const auto inputField = dynamic_cast<Ui::InputField*>(
 				focused->parentWidget())) {
-				markdownEnabled = inputField->isMarkdownEnabled();
+				markdownState = inputField->markdownEnabledState();
 			}
 		}
 	} else if (const auto list = dynamic_cast<HistoryInner*>(focused)) {
@@ -489,13 +489,19 @@ void MainWindow::updateGlobalMenuHook() {
 	ForceDisabled(psNewGroup, inactive || support);
 	ForceDisabled(psNewChannel, inactive || support);
 
-	ForceDisabled(psBold, !markdownEnabled);
-	ForceDisabled(psItalic, !markdownEnabled);
-	ForceDisabled(psUnderline, !markdownEnabled);
-	ForceDisabled(psStrikeOut, !markdownEnabled);
-	ForceDisabled(psBlockquote, !markdownEnabled);
-	ForceDisabled(psMonospace, !markdownEnabled);
-	ForceDisabled(psClearFormat, !markdownEnabled);
+	const auto diabled = [=](const QString &tag) {
+		return !markdownState.enabledForTag(tag);
+	};
+	using Field = Ui::InputField;
+	ForceDisabled(psBold, diabled(Field::kTagBold));
+	ForceDisabled(psItalic, diabled(Field::kTagItalic));
+	ForceDisabled(psUnderline, diabled(Field::kTagUnderline));
+	ForceDisabled(psStrikeOut, diabled(Field::kTagStrikeOut));
+	ForceDisabled(psBlockquote, diabled(Field::kTagBlockquote));
+	ForceDisabled(
+		psMonospace,
+		diabled(Field::kTagPre) || diabled(Field::kTagCode));
+	ForceDisabled(psClearFormat, markdownState.disabled());
 }
 
 bool MainWindow::eventFilter(QObject *obj, QEvent *evt) {
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index 2a3a59b9cfd14..63ed4009b30bf 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -64,8 +64,6 @@ class MainWindow : public Window::MainWindow {
 
 	base::Timer _hideAfterFullScreenTimer;
 
-	rpl::variable<bool> _canApplyMarkdown;
-
 	QMenuBar psMainMenu;
 	QAction *psLogout = nullptr;
 	QAction *psUndo = nullptr;
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 9b0dd14bbfd07..43ba894b43abb 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -92,10 +92,11 @@ - (void) screenIsUnlocked:(NSNotification *)aNotification;
 	void setNativeWindow(NSWindow *window, NSView *view);
 	void initTouchBar(
 		NSWindow *window,
-		not_null<Window::Controller*> controller,
-		rpl::producer<bool> canApplyMarkdown);
+		not_null<Window::Controller*> controller);
 	void setWindowBadge(const QString &str);
 
+	void setMarkdownEnabledState(Ui::MarkdownEnabledState state);
+
 	bool clipboardHasText();
 	~Private();
 
@@ -103,6 +104,8 @@ void initTouchBar(
 	not_null<MainWindow*> _public;
 	friend class MainWindow;
 
+	rpl::variable<Ui::MarkdownEnabledState> _markdownState;
+
 	NSWindow * __weak _nativeWindow = nil;
 	NSView * __weak _nativeView = nil;
 
@@ -229,8 +232,7 @@ QString strNotificationAboutScreenUnlocked() {
 
 void MainWindow::Private::initTouchBar(
 		NSWindow *window,
-		not_null<Window::Controller*> controller,
-		rpl::producer<bool> canApplyMarkdown) {
+		not_null<Window::Controller*> controller) {
 	if (!IsMac10_13OrGreater()) {
 		return;
 	}
@@ -240,12 +242,17 @@ QString strNotificationAboutScreenUnlocked() {
 	[window
 		performSelectorOnMainThread:@selector(setTouchBar:)
 		withObject:[[[RootTouchBar alloc]
-			init:std::move(canApplyMarkdown)
+			init:_markdownState.value()
 			controller:controller
 			domain:(&Core::App().domain())] autorelease]
 		waitUntilDone:true];
 }
 
+void MainWindow::Private::setMarkdownEnabledState(
+		Ui::MarkdownEnabledState state) {
+	_markdownState = state;
+}
+
 bool MainWindow::Private::clipboardHasText() {
 	auto currentChangeCount = static_cast<int>([_generalPasteboard changeCount]);
 	if (_generalPasteboardChangeCount != currentChangeCount) {
@@ -289,10 +296,7 @@ QString strNotificationAboutScreenUnlocked() {
 	if (auto view = reinterpret_cast<NSView*>(winId())) {
 		if (auto window = [view window]) {
 			_private->setNativeWindow(window, view);
-			_private->initTouchBar(
-				window,
-				&controller(),
-				_canApplyMarkdown.changes());
+			_private->initTouchBar(window, &controller());
 		}
 	}
 }
@@ -558,7 +562,7 @@ QString strNotificationAboutScreenUnlocked() {
 	auto focused = QApplication::focusWidget();
 	bool canUndo = false, canRedo = false, canCut = false, canCopy = false, canPaste = false, canDelete = false, canSelectAll = false;
 	auto clipboardHasText = _private->clipboardHasText();
-	auto canApplyMarkdown = false;
+	auto markdownState = Ui::MarkdownEnabledState();
 	if (auto edit = qobject_cast<QLineEdit*>(focused)) {
 		canCut = canCopy = canDelete = edit->hasSelectedText();
 		canSelectAll = !edit->text().isEmpty();
@@ -574,7 +578,7 @@ QString strNotificationAboutScreenUnlocked() {
 		if (canCopy) {
 			if (const auto inputField = dynamic_cast<Ui::InputField*>(
 					focused->parentWidget())) {
-				canApplyMarkdown = inputField->isMarkdownEnabled();
+				markdownState = inputField->markdownEnabledState();
 			}
 		}
 	} else if (auto list = dynamic_cast<HistoryInner*>(focused)) {
@@ -582,7 +586,7 @@ QString strNotificationAboutScreenUnlocked() {
 		canDelete = list->canDeleteSelected();
 	}
 
-	_canApplyMarkdown = canApplyMarkdown;
+	_private->setMarkdownEnabledState(markdownState);
 
 	updateIsActive();
 	const auto logged = (sessionController() != nullptr);
@@ -603,13 +607,19 @@ QString strNotificationAboutScreenUnlocked() {
 	ForceDisabled(psNewChannel, inactive || support);
 	ForceDisabled(psShowTelegram, isActive());
 
-	ForceDisabled(psBold, !canApplyMarkdown);
-	ForceDisabled(psItalic, !canApplyMarkdown);
-	ForceDisabled(psUnderline, !canApplyMarkdown);
-	ForceDisabled(psStrikeOut, !canApplyMarkdown);
-	ForceDisabled(psBlockquote, !canApplyMarkdown);
-	ForceDisabled(psMonospace, !canApplyMarkdown);
-	ForceDisabled(psClearFormat, !canApplyMarkdown);
+	const auto diabled = [=](const QString &tag) {
+		return !markdownState.enabledForTag(tag);
+	};
+	using Field = Ui::InputField;
+	ForceDisabled(psBold, diabled(Field::kTagBold));
+	ForceDisabled(psItalic, diabled(Field::kTagItalic));
+	ForceDisabled(psUnderline, diabled(Field::kTagUnderline));
+	ForceDisabled(psStrikeOut, diabled(Field::kTagStrikeOut));
+	ForceDisabled(psBlockquote, diabled(Field::kTagBlockquote));
+	ForceDisabled(
+		psMonospace,
+		diabled(Field::kTagPre) || diabled(Field::kTagCode));
+	ForceDisabled(psClearFormat, markdownState.disabled());
 }
 
 bool MainWindow::eventFilter(QObject *obj, QEvent *evt) {
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h
index 464f87c9c1827..f34cf8190fd47 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h
@@ -17,9 +17,13 @@ namespace Window {
 class Controller;
 } // namespace Window
 
+namespace Ui {
+struct MarkdownEnabledState;
+} // namespace Ui
+
 API_AVAILABLE(macos(10.12.2))
 @interface RootTouchBar : NSTouchBar<NSTouchBarDelegate>
-- (id)init:(rpl::producer<bool>)canApplyMarkdown
+- (id)init:(rpl::producer<Ui::MarkdownEnabledState>)markdownState
 	controller:(not_null<Window::Controller*>)controller
 	domain:(not_null<Main::Domain*>)domain;
 @end
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
index 5f314e4b5502c..ea273dab7f7ae 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
@@ -20,6 +20,7 @@
 #include "platform/mac/touchbar/mac_touchbar_audio.h"
 #include "platform/mac/touchbar/mac_touchbar_common.h"
 #include "platform/mac/touchbar/mac_touchbar_main.h"
+#include "ui/widgets/fields/input_field.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 
@@ -57,13 +58,12 @@ @implementation RootTouchBar {
 	Main::Session *_session;
 	Window::Controller *_controller;
 
-	bool _canApplyMarkdownLast;
-	rpl::event_stream<bool> _canApplyMarkdown;
+	rpl::variable<Ui::MarkdownEnabledState> _markdownState;
 	rpl::event_stream<> _touchBarSwitches;
 	rpl::lifetime _lifetime;
 }
 
-- (id)init:(rpl::producer<bool>)canApplyMarkdown
+- (id)init:(rpl::producer<Ui::MarkdownEnabledState>)markdownState
 		controller:(not_null<Window::Controller*>)controller
 		domain:(not_null<Main::Domain*>)domain {
 	self = [super init];
@@ -75,10 +75,7 @@ - (id)init:(rpl::producer<bool>)canApplyMarkdown
 		self.defaultItemIdentifiers = @[];
 	});
 	_controller = controller;
-	_canApplyMarkdownLast = false;
-	std::move(
-		canApplyMarkdown
-	) | rpl::start_to_stream(_canApplyMarkdown, _lifetime);
+	_markdownState = std::move(markdownState);
 
 	auto sessionChanges = domain->activeSessionChanges(
 	) | rpl::map([=](Main::Session *session) {
@@ -140,8 +137,7 @@ - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
 				init:_controller
 				touchBarSwitches:_touchBarSwitches.events()] autorelease];
 		rpl::combine(
-			_canApplyMarkdown.events_starting_with_copy(
-				_canApplyMarkdownLast),
+			_markdownState.value(),
 			_controller->sessionController()->activeChatValue(
 			) | rpl::map([](Dialogs::Key k) {
 				const auto topic = k.topic();
@@ -153,16 +149,15 @@ - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
 					: (peer && Data::CanSendAnyOf(peer, rights));
 			}) | rpl::distinct_until_changed()
 		) | rpl::start_with_next([=](
-				bool canApplyMarkdown,
+				Ui::MarkdownEnabledState state,
 				bool hasActiveChat) {
-			_canApplyMarkdownLast = canApplyMarkdown;
 			item.groupTouchBar.defaultItemIdentifiers = @[
 				kPinnedPanelItemIdentifier,
-				canApplyMarkdown
+				(!state.disabled()
 					? kPopoverInputItemIdentifier
 					: hasActiveChat
 					? kPopoverPickerItemIdentifier
-					: @""];
+					: @"")];
 		}, [item lifetime]);
 
 		return [item autorelease];
diff --git a/Telegram/SourceFiles/support/support_helper.cpp b/Telegram/SourceFiles/support/support_helper.cpp
index 08f27db07dd2b..286f1fc6c8e29 100644
--- a/Telegram/SourceFiles/support/support_helper.cpp
+++ b/Telegram/SourceFiles/support/support_helper.cpp
@@ -88,7 +88,7 @@ EditInfoBox::EditInfoBox(
 	_field->setInstantReplaces(Ui::InstantReplaces::Default());
 	_field->setInstantReplacesEnabled(
 		Core::App().settings().replaceEmojiValue());
-	_field->setMarkdownReplacesEnabled(rpl::single(true));
+	_field->setMarkdownReplacesEnabled(true);
 	_field->setEditLinkCallback(
 		DefaultEditLinkCallback(controller->uiShow(), _field));
 }
diff --git a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
index 16a5b14afc3df..2c371da40d333 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
@@ -16,7 +16,8 @@ void EditFactcheckBox(
 		not_null<Ui::GenericBox*> box,
 		TextWithEntities current,
 		int limit,
-		Fn<void(TextWithEntities)> save) {
+		Fn<void(TextWithEntities)> save,
+		Fn<void(not_null<Ui::InputField*>)> initField) {
 	box->setTitle(tr::lng_factcheck_title());
 
 	const auto field = box->addRow(object_ptr<Ui::InputField>(
@@ -29,6 +30,7 @@ void EditFactcheckBox(
 			TextUtilities::ConvertEntitiesToTextTags(current.entities)
 		}));
 	AddLengthLimitLabel(field, limit);
+	initField(field);
 
 	enum class State {
 		Initial,
diff --git a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h
index 7eb104af3c988..b2ca164799bac 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h
+++ b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.h
@@ -9,8 +9,13 @@ For license and copyright information please follow this link:
 
 #include "ui/layers/generic_box.h"
 
+namespace Ui {
+class InputField;
+} // namespace Ui
+
 void EditFactcheckBox(
 	not_null<Ui::GenericBox*> box,
 	TextWithEntities current,
 	int limit,
-	Fn<void(TextWithEntities)> save);
+	Fn<void(TextWithEntities)> save,
+	Fn<void(not_null<Ui::InputField*>)> initField);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index e7c598affe724..0835adcc2d3cb 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit e7c598affe724322577ef46d9a07d1dcac3c617b
+Subproject commit 0835adcc2d3cb1f2cf0d3630f6d95485864621f9

From 7194781bb836a34524de21c6246dbff51bc1daf3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 16:02:05 +0300
Subject: [PATCH 248/400] Added api support for premium bot peer type for
 credits history entries.

---
 Telegram/SourceFiles/api/api_credits.cpp      | 34 +++++++++++++++++++
 Telegram/SourceFiles/api/api_credits.h        |  3 ++
 .../info_statistics_list_controllers.cpp      | 19 +++++++----
 .../info_statistics_list_controllers.h        |  2 +-
 .../SourceFiles/settings/settings_credits.cpp | 21 ++++++++----
 .../ui/effects/credits_graphics.cpp           | 16 ++++++++-
 6 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 61ce79870f745..1604d6d5ce650 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #if _DEBUG
 #include "base/random.h"
@@ -155,4 +156,37 @@ Data::CreditTopupOptions CreditsTopupOptions::options() const {
 	return _options;
 }
 
+rpl::producer<not_null<PeerData*>> PremiumPeerBot(
+		not_null<Main::Session*> session) {
+	const auto username = session->appConfig().get<QString>(
+		u"premium_bot_username"_q,
+		QString());
+	if (username.isEmpty()) {
+		return rpl::never<not_null<PeerData*>>();
+	}
+	if (const auto p = session->data().peerByUsername(username)) {
+		return rpl::single<not_null<PeerData*>>(p);
+	}
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		const auto api = lifetime.make_state<MTP::Sender>(&session->mtp());
+
+		api->request(MTPcontacts_ResolveUsername(
+			MTP_string(username)
+		)).done([=](const MTPcontacts_ResolvedPeer &result) {
+			session->data().processUsers(result.data().vusers());
+			session->data().processChats(result.data().vchats());
+			const auto botPeer = session->data().peerLoaded(
+				peerFromMTP(result.data().vpeer()));
+			if (!botPeer) {
+				return consumer.put_done();
+			}
+			consumer.put_next(not_null{ botPeer });
+		}).send();
+
+		return lifetime;
+	};
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_credits.h b/Telegram/SourceFiles/api/api_credits.h
index 5807f34c74eea..265e7b3871076 100644
--- a/Telegram/SourceFiles/api/api_credits.h
+++ b/Telegram/SourceFiles/api/api_credits.h
@@ -68,4 +68,7 @@ class CreditsHistory final {
 
 };
 
+[[nodiscard]] rpl::producer<not_null<PeerData*>> PremiumPeerBot(
+	not_null<Main::Session*> session);
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 5154a3044058e..ecbcff3ec9dc9 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -121,7 +121,7 @@ struct BoostsDescriptor final {
 struct CreditsDescriptor final {
 	Data::CreditsStatusSlice firstSlice;
 	Fn<void(const Data::CreditsHistoryEntry &)> entryClickedCallback;
-	not_null<PeerData*> peer;
+	not_null<PeerData*> premiumBot;
 	not_null<QImage*> creditIcon;
 	bool in = false;
 	bool out = false;
@@ -768,7 +768,7 @@ void CreditsRow::init() {
 		constexpr auto kMinus = QChar(0x2212);
 		_rightText.setText(
 			st::semiboldTextStyle,
-			(PeerListRow::special() ? QChar('+') : kMinus)
+			(!_entry.bareId ? QChar('+') : kMinus)
 				+ Lang::FormatCountDecimal(_entry.credits));
 	}
 	_paintUserpicCallback = !PeerListRow::special()
@@ -816,7 +816,7 @@ void CreditsRow::rightActionPaint(
 		bool actionSelected) {
 	const auto &font = _rightText.style()->font;
 	y += _rowHeight / 2;
-	p.setPen(PeerListRow::special()
+	p.setPen(!_entry.bareId
 		? st::boxTextFgGood
 		: st::menuIconAttentionColor);
 	x += st::creditsHistoryRightSkip;
@@ -850,6 +850,7 @@ class CreditsController final : public PeerListController {
 	void applySlice(const Data::CreditsStatusSlice &slice);
 
 	const not_null<Main::Session*> _session;
+	const not_null<PeerData*> _premiumBot;
 	Fn<void(const Data::CreditsHistoryEntry &)> _entryClickedCallback;
 	not_null<QImage*> const _creditIcon;
 
@@ -863,10 +864,11 @@ class CreditsController final : public PeerListController {
 };
 
 CreditsController::CreditsController(CreditsDescriptor d)
-: _session(&d.peer->session())
+: _session(&d.premiumBot->session())
+, _premiumBot(d.premiumBot)
 , _entryClickedCallback(std::move(d.entryClickedCallback))
 , _creditIcon(d.creditIcon)
-, _api(d.peer, d.in, d.out)
+, _api(d.premiumBot, d.in, d.out)
 , _firstSlice(std::move(d.firstSlice)) {
 	PeerListController::setStyleOverrides(&st::boostsListBox);
 }
@@ -906,9 +908,12 @@ void CreditsController::applySlice(const Data::CreditsStatusSlice &slice) {
 				.creditIcon = _creditIcon,
 				.rowHeight = computeListSt().item.height,
 			};
+			using Type = Data::CreditsHistoryEntry::PeerType;
 			if (item.bareId) {
 				const auto peer = session().data().peer(PeerId(item.bareId));
 				return std::make_unique<CreditsRow>(peer, descriptor);
+			} else if (item.peerType == Type::PremiumBot) {
+				return std::make_unique<CreditsRow>(_premiumBot, descriptor);
 			} else {
 				return std::make_unique<CreditsRow>(descriptor);
 			}
@@ -1084,7 +1089,7 @@ void AddCreditsHistoryList(
 		const Data::CreditsStatusSlice &firstSlice,
 		not_null<Ui::VerticalLayout*> container,
 		Fn<void(const Data::CreditsHistoryEntry &)> callback,
-		not_null<PeerData*> self,
+		not_null<PeerData*> bot,
 		not_null<QImage*> icon,
 		bool in,
 		bool out) {
@@ -1094,7 +1099,7 @@ void AddCreditsHistoryList(
 		PeerListContentDelegateSimple delegate;
 		CreditsController controller;
 	};
-	auto d = CreditsDescriptor{ firstSlice, callback, self, icon, in, out };
+	auto d = CreditsDescriptor{ firstSlice, callback, bot, icon, in, out };
 	const auto state = container->lifetime().make_state<State>(std::move(d));
 
 	state->delegate.setContent(container->add(
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h
index 0e3d000195f6f..09883090d2f99 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h
@@ -50,7 +50,7 @@ void AddCreditsHistoryList(
 	const Data::CreditsStatusSlice &firstSlice,
 	not_null<Ui::VerticalLayout*> container,
 	Fn<void(const Data::CreditsHistoryEntry &)> entryClickedCallback,
-	not_null<PeerData*> self,
+	not_null<PeerData*> premiumBot,
 	not_null<QImage*> creditIcon,
 	bool in,
 	bool out);
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 127c5fd91904c..1b9efbe073920 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -366,6 +366,7 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
 
 	const auto fill = [=](
+			not_null<PeerData*> premiumBot,
 			const Data::CreditsStatusSlice &fullSlice,
 			const Data::CreditsStatusSlice &inSlice,
 			const Data::CreditsStatusSlice &outSlice) {
@@ -475,8 +476,12 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 			Ui::AddSkip(content);
 			Ui::AddSkip(content);
 
+			using Type = Data::CreditsHistoryEntry::PeerType;
+
 			const auto &stUser = st::boostReplaceUserpic;
-			const auto peer = e.bareId
+			const auto peer = (e.peerType == Type::PremiumBot)
+				? premiumBot.get()
+				: e.bareId
 				? _controller->session().data().peer(PeerId(e.bareId)).get()
 				: nullptr;
 			if (peer) {
@@ -580,7 +585,7 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 			fullSlice,
 			fullWrap->entity(),
 			entryClicked,
-			_controller->session().user(),
+			premiumBot,
 			&_star,
 			true,
 			true);
@@ -588,7 +593,7 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 			inSlice,
 			inWrap->entity(),
 			entryClicked,
-			_controller->session().user(),
+			premiumBot,
 			&_star,
 			true,
 			false);
@@ -596,7 +601,7 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 			outSlice,
 			outWrap->entity(),
 			std::move(entryClicked),
-			_controller->session().user(),
+			premiumBot,
 			&_star,
 			false,
 			true);
@@ -617,8 +622,12 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 		apiFull->request({}, [=](Data::CreditsStatusSlice fullSlice) {
 			apiIn->request({}, [=](Data::CreditsStatusSlice inSlice) {
 				apiOut->request({}, [=](Data::CreditsStatusSlice outSlice) {
-					fill(fullSlice, inSlice, outSlice);
-					apiLifetime->destroy();
+					::Api::PremiumPeerBot(
+						&_controller->session()
+					) | rpl::start_with_next([=](not_null<PeerData*> bot) {
+						fill(bot, fullSlice, inSlice, outSlice);
+						apiLifetime->destroy();
+					}, *apiLifetime);
 				});
 			});
 		});
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
index fd465f6b33d17..44e82195a9fc3 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
@@ -16,6 +16,7 @@ For license and copyright information please follow this link:
 #include "styles/style_credits.h"
 #include "styles/style_intro.h" // introFragmentIcon.
 #include "styles/style_settings.h"
+#include "styles/style_dialogs.h"
 
 namespace Ui {
 
@@ -38,6 +39,13 @@ PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 			return { st::historyPeer2UserpicBg, st::historyPeer2UserpicBg2 };
 		case Data::CreditsHistoryEntry::PeerType::Fragment:
 			return { st::historyPeer8UserpicBg, st::historyPeer8UserpicBg2 };
+		case Data::CreditsHistoryEntry::PeerType::PremiumBot:
+			return { st::historyPeer8UserpicBg, st::historyPeer8UserpicBg2 };
+		case Data::CreditsHistoryEntry::PeerType::Unsupported:
+			return {
+				st::historyPeerArchiveUserpicBg,
+				st::historyPeerArchiveUserpicBg,
+			};
 		}
 		Unexpected("Unknown peer type.");
 	}();
@@ -45,11 +53,17 @@ PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
 		userpic->paintCircle(p, x, y, outerWidth, size);
 		using PeerType = Data::CreditsHistoryEntry::PeerType;
+		if (entry.peerType == PeerType::PremiumBot) {
+			return;
+		}
+		const auto rect = QRect(x, y, size, size);
 		((entry.peerType == PeerType::AppStore)
 			? st::sessionIconiPhone
 			: (entry.peerType == PeerType::PlayMarket)
 			? st::sessionIconAndroid
-			: st::introFragmentIcon).paintInCenter(p, { x, y, size, size });
+			: (entry.peerType == PeerType::Fragment)
+			? st::introFragmentIcon
+			: st::dialogsInaccessibleUserpic).paintInCenter(p, rect);
 	};
 }
 

From 1d3110228d6930f97f238f59567322d58c7abc46 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 May 2024 18:24:59 +0400
Subject: [PATCH 249/400] Fix phrase in factcheck toast.

---
 Telegram/SourceFiles/data/components/factchecks.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/factchecks.cpp b/Telegram/SourceFiles/data/components/factchecks.cpp
index d068f81461cb2..77251925ef34b 100644
--- a/Telegram/SourceFiles/data/components/factchecks.cpp
+++ b/Telegram/SourceFiles/data/components/factchecks.cpp
@@ -207,9 +207,9 @@ void Factchecks::save(
 	save(itemId, std::move(text), [=](QString error) {
 		show->showToast(!error.isEmpty()
 			? error
-			: wasEmpty
-			? tr::lng_factcheck_remove_done(tr::now)
 			: textEmpty
+			? tr::lng_factcheck_remove_done(tr::now)
+			: wasEmpty
 			? tr::lng_factcheck_add_done(tr::now)
 			: tr::lng_factcheck_edit_done(tr::now));
 	});

From 923aaec085cd10bd3dc87675307f3c811b489d44 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 20:46:23 +0300
Subject: [PATCH 250/400] Returned media to messages with credits invoice.

---
 .../SourceFiles/history/view/media/history_view_invoice.cpp    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
index 65987e6bb09b5..ace70246a7d94 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
@@ -7,7 +7,6 @@ For license and copyright information please follow this link:
 */
 #include "history/view/media/history_view_invoice.h"
 
-#include "boxes/send_credits_box.h" // IsCreditsInvoice.
 #include "lang/lang_keys.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
@@ -35,7 +34,7 @@ Invoice::Invoice(
 }
 
 void Invoice::fillFromData(not_null<Data::Invoice*> invoice) {
-	const auto isCreditsCurrency = Ui::IsCreditsInvoice(_parent->data());
+	const auto isCreditsCurrency = false;
 	if (invoice->photo && !isCreditsCurrency) {
 		const auto spoiler = false;
 		_attach = std::make_unique<Photo>(

From f08ff9247083c72de12fbcf7a9c6039673054fb5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 20:54:13 +0300
Subject: [PATCH 251/400] Added initial ability to provide data for non-panel
 payment forms.

---
 .../payments/payments_checkout_process.cpp    |   1 +
 .../payments/payments_checkout_process.h      |   5 +
 .../SourceFiles/payments/payments_form.cpp    |  37 ++++-
 Telegram/SourceFiles/payments/payments_form.h | 128 ++++++++++--------
 4 files changed, 113 insertions(+), 58 deletions(-)

diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index 108376084d9d7..14e7d695dfc6a 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -381,6 +381,7 @@ void CheckoutProcess::handleFormUpdate(const FormUpdate &update) {
 		if (weak) {
 			closeAndReactivate(CheckoutResult::Paid);
 		}
+	}, [&](const CreditsPaymentStarted &data) {
 	}, [&](const Error &error) {
 		handleError(error);
 	});
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.h b/Telegram/SourceFiles/payments/payments_checkout_process.h
index 9a87039272287..e26fff3cdb78a 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.h
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.h
@@ -40,6 +40,7 @@ struct Error;
 struct InvoiceCredits;
 struct InvoiceId;
 struct InvoicePremiumGiftCode;
+struct CreditsFormData;
 
 enum class Mode {
 	Payment,
@@ -53,6 +54,10 @@ enum class CheckoutResult {
 	Failed,
 };
 
+struct NonPanelPaymentForm : std::variant<std::shared_ptr<CreditsFormData>> {
+	using variant::variant;
+};
+
 struct PaidInvoice {
 	QString title;
 };
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index b6512d532daff..f3283b570a218 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -376,7 +376,42 @@ void Form::requestForm() {
 		MTP_dataJSON(MTP_bytes(Window::Theme::WebViewParams().json))
 	)).done([=](const MTPpayments_PaymentForm &result) {
 		hideProgress();
-		processForm(result);
+		result.match([&](const MTPDpayments_paymentForm &data) {
+			processForm(result);
+		}, [&](const MTPDpayments_paymentFormStars &data) {
+			_session->data().processUsers(data.vusers());
+			const auto currency = qs(data.vinvoice().data().vcurrency());
+			const auto &tlPrices = data.vinvoice().data().vprices().v;
+			const auto amount = tlPrices.empty()
+				? 0
+				: tlPrices.front().data().vamount().v;
+			if (currency != "XTR" || !amount) {
+				using Type = Error::Type;
+				_updates.fire(Error{ Type::Form, u"Bad Stars Form."_q });
+				return;
+			}
+			const auto invoice = InvoiceCredits{
+				.session = _session,
+				.randomId = 0,
+				.credits = amount,
+				.currency = currency,
+				.amount = amount,
+			};
+			const auto formData = CreditsFormData{
+				.formId = data.vform_id().v,
+				.botId = data.vbot_id().v,
+				.title = qs(data.vtitle()),
+				.description = qs(data.vdescription()),
+				.photo = data.vphoto()
+					? _session->data().photoFromWeb(
+						*data.vphoto(),
+						ImageLocation())
+					: nullptr,
+				.invoice = invoice,
+				.inputInvoice = inputInvoice(),
+			};
+			_updates.fire(CreditsPaymentStarted{ .data = formData });
+		});
 	}).fail([=](const MTP::Error &error) {
 		hideProgress();
 		_updates.fire(Error{ Error::Type::Form, error.type() });
diff --git a/Telegram/SourceFiles/payments/payments_form.h b/Telegram/SourceFiles/payments/payments_form.h
index ffa6b17d73447..609af8213d1fa 100644
--- a/Telegram/SourceFiles/payments/payments_form.h
+++ b/Telegram/SourceFiles/payments/payments_form.h
@@ -120,63 +120,6 @@ struct PaymentMethod {
 	Ui::PaymentMethodDetails ui;
 };
 
-struct ToggleProgress {
-	bool shown = true;
-};
-struct FormReady {};
-struct ThumbnailUpdated {
-	QImage thumbnail;
-};
-struct ValidateFinished {};
-struct PaymentMethodUpdate {
-	bool requestNewPassword = false;
-};
-struct VerificationNeeded {
-	QString url;
-};
-struct TmpPasswordRequired {};
-struct BotTrustRequired {
-	not_null<UserData*> bot;
-	not_null<UserData*> provider;
-};
-struct PaymentFinished {
-	MTPUpdates updates;
-};
-struct Error {
-	enum class Type {
-		None,
-		Form,
-		Validate,
-		Stripe,
-		SmartGlocal,
-		TmpPassword,
-		Send,
-	};
-	Type type = Type::None;
-	QString id;
-
-	[[nodiscard]] bool empty() const {
-		return (type == Type::None);
-	}
-	[[nodiscard]] explicit operator bool() const {
-		return !empty();
-	}
-};
-
-struct FormUpdate : std::variant<
-	ToggleProgress,
-	FormReady,
-	ThumbnailUpdated,
-	ValidateFinished,
-	PaymentMethodUpdate,
-	VerificationNeeded,
-	TmpPasswordRequired,
-	BotTrustRequired,
-	PaymentFinished,
-	Error> {
-	using variant::variant;
-};
-
 struct InvoiceMessage {
 	not_null<PeerData*> peer;
 	MsgId itemId = 0;
@@ -234,6 +177,77 @@ struct InvoiceId {
 		InvoiceCredits> value;
 };
 
+struct CreditsFormData {
+	uint64 formId = 0;
+	uint64 botId = 0;
+	QString title;
+	QString description;
+	PhotoData *photo = nullptr;
+	InvoiceCredits invoice;
+	MTPInputInvoice inputInvoice;
+};
+
+struct ToggleProgress {
+	bool shown = true;
+};
+struct FormReady {};
+struct ThumbnailUpdated {
+	QImage thumbnail;
+};
+struct ValidateFinished {};
+struct PaymentMethodUpdate {
+	bool requestNewPassword = false;
+};
+struct VerificationNeeded {
+	QString url;
+};
+struct TmpPasswordRequired {};
+struct BotTrustRequired {
+	not_null<UserData*> bot;
+	not_null<UserData*> provider;
+};
+struct PaymentFinished {
+	MTPUpdates updates;
+};
+struct CreditsPaymentStarted {
+	CreditsFormData data;
+};
+struct Error {
+	enum class Type {
+		None,
+		Form,
+		Validate,
+		Stripe,
+		SmartGlocal,
+		TmpPassword,
+		Send,
+	};
+	Type type = Type::None;
+	QString id;
+
+	[[nodiscard]] bool empty() const {
+		return (type == Type::None);
+	}
+	[[nodiscard]] explicit operator bool() const {
+		return !empty();
+	}
+};
+
+struct FormUpdate : std::variant<
+	ToggleProgress,
+	FormReady,
+	ThumbnailUpdated,
+	ValidateFinished,
+	PaymentMethodUpdate,
+	VerificationNeeded,
+	TmpPasswordRequired,
+	BotTrustRequired,
+	PaymentFinished,
+	CreditsPaymentStarted,
+	Error> {
+	using variant::variant;
+};
+
 [[nodiscard]] not_null<Main::Session*> SessionFromId(const InvoiceId &id);
 
 [[nodiscard]] MTPinputStorePaymentPurpose InvoicePremiumGiftCodeGiveawayToTL(

From 3dd894ad30936f7a3deeb456715abe41316b5be2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 20:48:01 +0300
Subject: [PATCH 252/400] Improved SendCreditsBox for data from credits payment
 form.

---
 Telegram/SourceFiles/api/api_bot.cpp          |  2 +-
 .../SourceFiles/boxes/send_credits_box.cpp    | 64 ++++++++++++++-----
 Telegram/SourceFiles/boxes/send_credits_box.h |  6 +-
 3 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index befdc04e55c54..f4331cd1f83b3 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -332,7 +332,7 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 
 	case ButtonType::Buy: {
 		if (Ui::IsCreditsInvoice(item)) {
-			controller->uiShow()->show(Box(Ui::SendCreditsBox, item));
+			// controller->uiShow()->show(Box(Ui::SendCreditsBox, item));
 		} else {
 			Payments::CheckoutProcess::Start(
 				item,
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index ae45850bd46cb..743acd5d78955 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "boxes/send_credits_box.h"
 
 #include "api/api_credits.h"
+#include "apiwrap.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_credits.h"
 #include "data/data_file_origin.h"
@@ -17,8 +18,11 @@ For license and copyright information please follow this link:
 #include "data/stickers/data_custom_emoji.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "payments/payments_checkout_process.h"
+#include "payments/payments_form.h"
 #include "payments/payments_form.h"
 #include "settings/settings_credits.h"
 #include "ui/controls/userpic_button.h"
@@ -38,21 +42,21 @@ For license and copyright information please follow this link:
 #include "styles/style_settings.h"
 
 namespace Ui {
-namespace {
-} // namespace
 
 void SendCreditsBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<HistoryItem*> item) {
-	const auto media = item->media();
-	const auto invoice = media ? media->invoice() : nullptr;
-	if (!invoice) {
+		std::shared_ptr<Payments::CreditsFormData> form) {
+	if (!form) {
 		return;
 	}
+	struct State {
+		rpl::variable<bool> confirmButtonBusy = false;
+	};
+	const auto state = box->lifetime().make_state<State>();
 	box->setStyle(st::giveawayGiftCodeBox);
 	box->setNoContentMargin(true);
 
-	const auto session = &item->history()->owner().session();
+	const auto session = form->invoice.session;
 
 	const auto photoSize = st::defaultUserpicButton.photoSize;
 
@@ -87,7 +91,9 @@ void SendCreditsBox(
 		}, ministarsContainer->lifetime());
 	}
 
-	if (false && invoice->photo) {
+	const auto bot = session->data().user(form->botId);
+
+	if (form->photo) {
 		struct State {
 			std::shared_ptr<Data::PhotoMedia> view;
 			Image *image = nullptr;
@@ -98,8 +104,8 @@ void SendCreditsBox(
 			object_ptr<Ui::CenterWrap<>>(
 				content,
 				object_ptr<Ui::RpWidget>(content)))->entity();
-		state->view = invoice->photo->createMediaView();
-		state->view->wanted(Data::PhotoSize::Large, item->fullId());
+		state->view = form->photo->createMediaView();
+		form->photo->load(Data::PhotoSize::Thumbnail, {});
 
 		widget->resize(Size(photoSize));
 
@@ -135,7 +141,7 @@ void SendCreditsBox(
 				content,
 				object_ptr<Ui::UserpicButton>(
 					content,
-					item->author(),
+					bot,
 					st::defaultUserpicButton)));
 		widget->setAttribute(Qt::WA_TransparentForMouseEvents);
 	}
@@ -156,18 +162,42 @@ void SendCreditsBox(
 			box,
 			tr::lng_credits_box_out_sure(
 				lt_count,
-				rpl::single(invoice->amount) | tr::to_count(),
+				rpl::single(form->invoice.amount) | tr::to_count(),
 				lt_text,
-				rpl::single(TextWithEntities{ invoice->title }),
+				rpl::single(TextWithEntities{ form->title }),
 				lt_bot,
-				rpl::single(TextWithEntities{ item->author()->name() }),
+				rpl::single(TextWithEntities{ bot->name() }),
 				Ui::Text::RichLangValue),
 			st::creditsBoxAbout)));
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 
 	const auto button = box->addButton(rpl::single(QString()), [=] {
+		if (state->confirmButtonBusy.current()) {
+			return;
+		}
+		state->confirmButtonBusy = true;
+		session->api().request(
+			MTPpayments_SendStarsForm(
+				MTP_flags(0),
+				MTP_long(form->formId),
+				form->inputInvoice)
+		).done([=](auto result) {
+			state->confirmButtonBusy = false;
+			box->closeBox();
+		}).fail([=](const MTP::Error &error) {
+			state->confirmButtonBusy = false;
+			box->uiShow()->showToast(error.type());
+		}).send();
 	});
+	{
+		using namespace Info::Statistics;
+		const auto loadingAnimation = InfiniteRadialAnimationWidget(
+			button,
+			st::giveawayGiftCodeStartButton.height / 2);
+		AddChildToWidgetCenter(button.data(), loadingAnimation);
+		loadingAnimation->showOn(state->confirmButtonBusy.value());
+		}
 	{
 		const auto emojiMargin = QMargins(
 			0,
@@ -181,7 +211,7 @@ void SendCreditsBox(
 				true));
 		auto buttonText = tr::lng_credits_box_out_confirm(
 			lt_count,
-			rpl::single(invoice->amount) | tr::to_count(),
+			rpl::single(form->invoice.amount) | tr::to_count(),
 			lt_emoji,
 			rpl::single(buttonEmoji),
 			Ui::Text::RichLangValue);
@@ -208,6 +238,10 @@ void SendCreditsBox(
 				(size.height() - buttonLabel->height()) / 2);
 		}, buttonLabel->lifetime());
 		buttonLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+		state->confirmButtonBusy.value(
+		) | rpl::start_with_next([=](bool busy) {
+			buttonLabel->setVisible(!busy);
+		}, buttonLabel->lifetime());
 	}
 
 	const auto buttonWidth = st::boxWidth
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.h b/Telegram/SourceFiles/boxes/send_credits_box.h
index fa877e305fac8..37a093ca9706e 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.h
+++ b/Telegram/SourceFiles/boxes/send_credits_box.h
@@ -9,13 +9,17 @@ For license and copyright information please follow this link:
 
 class HistoryItem;
 
+namespace Payments {
+struct CreditsFormData;
+} // namespace Payments
+
 namespace Ui {
 
 class GenericBox;
 
 void SendCreditsBox(
 	not_null<Ui::GenericBox*> box,
-	not_null<HistoryItem*> item);
+	std::shared_ptr<Payments::CreditsFormData> data);
 
 [[nodiscard]] bool IsCreditsInvoice(not_null<HistoryItem*> item);
 

From dda6b92becc623d2b9a222c45735f5502169de90 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 20:47:15 +0300
Subject: [PATCH 253/400] Added initial ability to process non-panel payment
 forms.

---
 Telegram/CMakeLists.txt                       |  2 +
 Telegram/SourceFiles/api/api_bot.cpp          | 19 +++----
 .../SourceFiles/core/local_url_handlers.cpp   |  4 +-
 Telegram/SourceFiles/history/history_item.cpp |  6 ++-
 .../media/history_view_extended_preview.cpp   |  8 ++-
 .../inline_bots/bot_attach_web_view.cpp       | 10 +++-
 .../payments/payments_checkout_process.cpp    | 49 ++++++++++++++++---
 .../payments/payments_checkout_process.h      |  9 +++-
 .../payments/payments_non_panel_process.cpp   | 46 +++++++++++++++++
 .../payments/payments_non_panel_process.h     | 27 ++++++++++
 10 files changed, 155 insertions(+), 25 deletions(-)
 create mode 100644 Telegram/SourceFiles/payments/payments_non_panel_process.cpp
 create mode 100644 Telegram/SourceFiles/payments/payments_non_panel_process.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index a562048ec38af..75ab2b48f4d63 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1221,6 +1221,8 @@ PRIVATE
     payments/payments_checkout_process.h
     payments/payments_form.cpp
     payments/payments_form.h
+    payments/payments_non_panel_process.cpp
+    payments/payments_non_panel_process.h
     platform/linux/file_utilities_linux.cpp
     platform/linux/file_utilities_linux.h
     platform/linux/launcher_linux.cpp
diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index f4331cd1f83b3..cf4611563ae0a 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -10,7 +10,6 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "api/api_cloud_password.h"
 #include "api/api_send_progress.h"
-#include "boxes/send_credits_box.h"
 #include "boxes/share_box.h"
 #include "boxes/passcode_box.h"
 #include "boxes/url_auth_box.h"
@@ -28,6 +27,7 @@ For license and copyright information please follow this link:
 #include "history/history_item_components.h"
 #include "inline_bots/bot_attach_web_view.h"
 #include "payments/payments_checkout_process.h"
+#include "payments/payments_non_panel_process.h"
 #include "main/main_session.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
@@ -331,16 +331,13 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 	} break;
 
 	case ButtonType::Buy: {
-		if (Ui::IsCreditsInvoice(item)) {
-			// controller->uiShow()->show(Box(Ui::SendCreditsBox, item));
-		} else {
-			Payments::CheckoutProcess::Start(
-				item,
-				Payments::Mode::Payment,
-				crl::guard(controller, [=](auto) {
-					controller->widget()->activate();
-				}));
-		}
+		Payments::CheckoutProcess::Start(
+			item,
+			Payments::Mode::Payment,
+			crl::guard(controller, [=](auto) {
+				controller->widget()->activate();
+			}),
+			Payments::ProcessNonPanelPaymentFormFactory(controller, item));
 	} break;
 
 	case ButtonType::Url: {
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 6fa9d7bb6478d..5440386408787 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -22,6 +22,7 @@ For license and copyright information please follow this link:
 #include "boxes/background_preview_box.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/edit_birthday_box.h"
+#include "payments/payments_non_panel_process.h"
 #include "boxes/share_box.h"
 #include "boxes/connection_box.h"
 #include "boxes/edit_privacy_box.h"
@@ -1092,7 +1093,8 @@ bool ResolveInvoice(
 	Payments::CheckoutProcess::Start(
 		&controller->session(),
 		slug,
-		crl::guard(window, [=](auto) { window->activate(); }));
+		crl::guard(window, [=](auto) { window->activate(); }),
+		Payments::ProcessNonPanelPaymentFormFactory(controller));
 	return true;
 }
 
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 30cc8a9c3f9fd..c1af45c5f7271 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -63,6 +63,7 @@ For license and copyright information please follow this link:
 #include "data/data_web_page.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
 #include "payments/payments_checkout_process.h" // CheckoutProcess::Start.
+#include "payments/payments_non_panel_process.h" // ProcessNonPanelPaymentFormFactory.
 #include "platform/platform_notifications_manager.h"
 #include "spellcheck/spellcheck_highlight_syntax.h"
 #include "styles/style_dialogs.h"
@@ -3950,7 +3951,10 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 				CheckoutProcess::Start(
 					item,
 					Mode::Receipt,
-					crl::guard(weak, [=](auto) { weak->window().activate(); }));
+					crl::guard(weak, [=](auto) { weak->window().activate(); }),
+					Payments::ProcessNonPanelPaymentFormFactory(
+						weak.get(),
+						item));
 			}
 		});
 	} else if (type == mtpc_messageActionGroupCall
diff --git a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
index d127fc4fc1c0c..9db9acc07a678 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
@@ -22,6 +22,7 @@ For license and copyright information please follow this link:
 #include "ui/power_saving.h"
 #include "data/data_session.h"
 #include "payments/payments_checkout_process.h"
+#include "payments/payments_non_panel_process.h"
 #include "window/window_session_controller.h"
 #include "mainwindow.h"
 #include "core/click_handler_types.h"
@@ -41,7 +42,12 @@ namespace {
 				? crl::guard(
 					controller,
 					[=](auto) { controller->widget()->activate(); })
-				: Fn<void(Payments::CheckoutResult)>()));
+				: Fn<void(Payments::CheckoutResult)>()),
+			(controller
+				? Payments::ProcessNonPanelPaymentFormFactory(
+					controller,
+					item)
+				: nullptr));
 	});
 }
 
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 1eb99362bba47..03561bdd6f40d 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -43,6 +43,7 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "payments/payments_checkout_process.h"
+#include "payments/payments_non_panel_process.h"
 #include "storage/storage_account.h"
 #include "boxes/peer_list_controllers.h"
 #include "lang/lang_keys.h"
@@ -603,7 +604,14 @@ void AttachWebView::botHandleInvoice(QString slug) {
 		}
 	};
 	_panel->hideForPayment();
-	Payments::CheckoutProcess::Start(&_bot->session(), slug, reactivate);
+	Payments::CheckoutProcess::Start(
+		&_bot->session(),
+		slug,
+		reactivate,
+		_context
+			? Payments::ProcessNonPanelPaymentFormFactory(
+				_context->controller.get())
+			: nullptr);
 }
 
 void AttachWebView::botHandleMenuButton(Ui::BotWebView::MenuButton button) {
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index 14e7d695dfc6a..597d7687b9889 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -64,7 +64,9 @@ base::flat_map<not_null<Main::Session*>, SessionProcesses> Processes;
 void CheckoutProcess::Start(
 		not_null<const HistoryItem*> item,
 		Mode mode,
-		Fn<void(CheckoutResult)> reactivate) {
+		Fn<void(CheckoutResult)> reactivate,
+		Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess) {
+	const auto hasNonPanelPaymentFormProcess = !!nonPanelPaymentFormProcess;
 	auto &processes = LookupSessionProcesses(&item->history()->session());
 	const auto media = item->media();
 	const auto invoice = media ? media->invoice() : nullptr;
@@ -83,7 +85,11 @@ void CheckoutProcess::Start(
 	const auto i = processes.byItem.find(id);
 	if (i != end(processes.byItem)) {
 		i->second->setReactivateCallback(std::move(reactivate));
-		i->second->requestActivate();
+		i->second->setNonPanelPaymentFormProcess(
+			std::move(nonPanelPaymentFormProcess));
+		if (!hasNonPanelPaymentFormProcess) {
+			i->second->requestActivate();
+		}
 		return;
 	}
 	const auto j = processes.byItem.emplace(
@@ -92,19 +98,28 @@ void CheckoutProcess::Start(
 			InvoiceId{ InvoiceMessage{ item->history()->peer, id.msg } },
 			mode,
 			std::move(reactivate),
+			std::move(nonPanelPaymentFormProcess),
 			PrivateTag{})).first;
-	j->second->requestActivate();
+	if (!hasNonPanelPaymentFormProcess) {
+		j->second->requestActivate();
+	}
 }
 
 void CheckoutProcess::Start(
 		not_null<Main::Session*> session,
 		const QString &slug,
-		Fn<void(CheckoutResult)> reactivate) {
+		Fn<void(CheckoutResult)> reactivate,
+		Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess) {
+	const auto hasNonPanelPaymentFormProcess = !!nonPanelPaymentFormProcess;
 	auto &processes = LookupSessionProcesses(session);
 	const auto i = processes.bySlug.find(slug);
 	if (i != end(processes.bySlug)) {
 		i->second->setReactivateCallback(std::move(reactivate));
-		i->second->requestActivate();
+		i->second->setNonPanelPaymentFormProcess(
+			std::move(nonPanelPaymentFormProcess));
+		if (!hasNonPanelPaymentFormProcess) {
+			i->second->requestActivate();
+		}
 		return;
 	}
 	const auto j = processes.bySlug.emplace(
@@ -113,8 +128,11 @@ void CheckoutProcess::Start(
 			InvoiceId{ InvoiceSlug{ session, slug } },
 			Mode::Payment,
 			std::move(reactivate),
+			std::move(nonPanelPaymentFormProcess),
 			PrivateTag{})).first;
-	j->second->requestActivate();
+	if (!hasNonPanelPaymentFormProcess) {
+		j->second->requestActivate();
+	}
 }
 
 void CheckoutProcess::Start(
@@ -135,6 +153,7 @@ void CheckoutProcess::Start(
 			std::move(id),
 			Mode::Payment,
 			std::move(reactivate),
+			nullptr,
 			PrivateTag{})).first;
 	j->second->requestActivate();
 }
@@ -157,6 +176,7 @@ void CheckoutProcess::Start(
 			std::move(id),
 			Mode::Payment,
 			std::move(reactivate),
+			nullptr,
 			PrivateTag{})).first;
 	j->second->requestActivate();
 }
@@ -280,11 +300,13 @@ CheckoutProcess::CheckoutProcess(
 	InvoiceId id,
 	Mode mode,
 	Fn<void(CheckoutResult)> reactivate,
+	Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess,
 	PrivateTag)
 : _session(SessionFromId(id))
 , _form(std::make_unique<Form>(id, (mode == Mode::Receipt)))
 , _panel(std::make_unique<Ui::Panel>(panelDelegate()))
-, _reactivate(std::move(reactivate)) {
+, _reactivate(std::move(reactivate))
+, _nonPanelPaymentFormProcess(std::move(nonPanelPaymentFormProcess)) {
 	_form->updates(
 	) | rpl::start_with_next([=](const FormUpdate &update) {
 		handleFormUpdate(update);
@@ -299,7 +321,9 @@ CheckoutProcess::CheckoutProcess(
 	) | rpl::start_with_next([=] {
 		panelCancelEdit();
 	}, _panel->lifetime());
-	showForm();
+	if (!_nonPanelPaymentFormProcess) {
+		showForm();
+	}
 	_panel->toggleProgress(true);
 
 	if (mode == Mode::Payment) {
@@ -318,6 +342,11 @@ void CheckoutProcess::setReactivateCallback(
 	_reactivate = std::move(reactivate);
 }
 
+void CheckoutProcess::setNonPanelPaymentFormProcess(
+		Fn<void(NonPanelPaymentForm)> callback) {
+	_nonPanelPaymentFormProcess = std::move(callback);
+}
+
 void CheckoutProcess::requestActivate() {
 	_panel->requestActivate();
 }
@@ -382,6 +411,10 @@ void CheckoutProcess::handleFormUpdate(const FormUpdate &update) {
 			closeAndReactivate(CheckoutResult::Paid);
 		}
 	}, [&](const CreditsPaymentStarted &data) {
+		if (_nonPanelPaymentFormProcess) {
+			_nonPanelPaymentFormProcess(
+				std::make_shared<CreditsFormData>(data.data));
+		}
 	}, [&](const Error &error) {
 		handleError(error);
 	});
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.h b/Telegram/SourceFiles/payments/payments_checkout_process.h
index e26fff3cdb78a..2f939d5a68b60 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.h
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.h
@@ -71,11 +71,13 @@ class CheckoutProcess final
 	static void Start(
 		not_null<const HistoryItem*> item,
 		Mode mode,
-		Fn<void(CheckoutResult)> reactivate);
+		Fn<void(CheckoutResult)> reactivate,
+		Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess);
 	static void Start(
 		not_null<Main::Session*> session,
 		const QString &slug,
-		Fn<void(CheckoutResult)> reactivate);
+		Fn<void(CheckoutResult)> reactivate,
+		Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess);
 	static void Start(
 		InvoicePremiumGiftCode giftCodeInvoice,
 		Fn<void(CheckoutResult)> reactivate);
@@ -93,6 +95,7 @@ class CheckoutProcess final
 		InvoiceId id,
 		Mode mode,
 		Fn<void(CheckoutResult)> reactivate,
+		Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess,
 		PrivateTag);
 	~CheckoutProcess();
 
@@ -111,6 +114,7 @@ class CheckoutProcess final
 	static void UnregisterPaymentStart(not_null<CheckoutProcess*> process);
 
 	void setReactivateCallback(Fn<void(CheckoutResult)> reactivate);
+	void setNonPanelPaymentFormProcess(Fn<void(NonPanelPaymentForm)>);
 	void requestActivate();
 	void closeAndReactivate(CheckoutResult result);
 	void close();
@@ -173,6 +177,7 @@ class CheckoutProcess final
 	const std::unique_ptr<Ui::Panel> _panel;
 	QPointer<PasscodeBox> _enterPasswordBox;
 	Fn<void(CheckoutResult)> _reactivate;
+	Fn<void(NonPanelPaymentForm)> _nonPanelPaymentFormProcess;
 	SubmitState _submitState = SubmitState::None;
 	bool _initialSilentValidation = false;
 	bool _sendFormPending = false;
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
new file mode 100644
index 0000000000000..3669576d9af98
--- /dev/null
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "payments/payments_non_panel_process.h"
+
+#include "payments/payments_checkout_process.h" // NonPanelPaymentForm.
+#include "payments/payments_form.h"
+#include "history/history_item.h"
+#include "ui/layers/generic_box.h"
+#include "window/window_session_controller.h"
+#include "boxes/send_credits_box.h"
+
+namespace Payments {
+namespace {
+
+bool IsCreditsInvoice(not_null<HistoryItem*> item) {
+	const auto media = item->media();
+	const auto invoice = media ? media->invoice() : nullptr;
+	return invoice && (invoice->currency == "XTR");
+}
+
+} // namespace
+
+Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
+		not_null<Window::SessionController*> controller) {
+	return [=](NonPanelPaymentForm form) {
+		using CreditsFormDataPtr = std::shared_ptr<CreditsFormData>;
+		if (const auto creditsData = std::get_if<CreditsFormDataPtr>(&form)) {
+			controller->uiShow()->show(Box(Ui::SendCreditsBox, *creditsData));
+		}
+	};
+}
+
+Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item) {
+	return IsCreditsInvoice(item)
+		? ProcessNonPanelPaymentFormFactory(controller)
+		: nullptr;
+}
+
+} // namespace Payments
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.h b/Telegram/SourceFiles/payments/payments_non_panel_process.h
new file mode 100644
index 0000000000000..76939415d22d8
--- /dev/null
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.h
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class HistoryItem;
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Payments {
+
+struct NonPanelPaymentForm;
+
+Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
+	not_null<Window::SessionController*> controller);
+
+Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
+	not_null<Window::SessionController*> controller,
+	not_null<HistoryItem*> item);
+
+} // namespace Payments

From e4e343b871155d3b80143cd46b0fb8ed8d2818b1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 20:47:36 +0300
Subject: [PATCH 254/400] Removed unused Ui::IsCreditsInvoice.

---
 Telegram/SourceFiles/boxes/send_credits_box.cpp | 6 ------
 Telegram/SourceFiles/boxes/send_credits_box.h   | 2 --
 2 files changed, 8 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 743acd5d78955..445bc9029db60 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -288,10 +288,4 @@ void SendCreditsBox(
 	}
 }
 
-bool IsCreditsInvoice(not_null<HistoryItem*> item) {
-	const auto media = item->media();
-	const auto invoice = media ? media->invoice() : nullptr;
-	return invoice && (invoice->currency == "XTR");
-}
-
 } // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.h b/Telegram/SourceFiles/boxes/send_credits_box.h
index 37a093ca9706e..bbc74107a682c 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.h
+++ b/Telegram/SourceFiles/boxes/send_credits_box.h
@@ -21,6 +21,4 @@ void SendCreditsBox(
 	not_null<Ui::GenericBox*> box,
 	std::shared_ptr<Payments::CreditsFormData> data);
 
-[[nodiscard]] bool IsCreditsInvoice(not_null<HistoryItem*> item);
-
 } // namespace Ui

From d73313479b9e2d44cb99241e906f6a4c7ad836f4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 21:01:44 +0300
Subject: [PATCH 255/400] Partly reverted "Processed payments form with API
 scheme on layer 181.".

---
 .../SourceFiles/payments/payments_form.cpp    | 114 +++++++-----------
 Telegram/SourceFiles/payments/payments_form.h |   4 +-
 2 files changed, 47 insertions(+), 71 deletions(-)

diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index f3283b570a218..8cdd0b9a2cc59 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -377,7 +377,7 @@ void Form::requestForm() {
 	)).done([=](const MTPpayments_PaymentForm &result) {
 		hideProgress();
 		result.match([&](const MTPDpayments_paymentForm &data) {
-			processForm(result);
+			processForm(data);
 		}, [&](const MTPDpayments_paymentFormStars &data) {
 			_session->data().processUsers(data.vusers());
 			const auto currency = qs(data.vinvoice().data().vcurrency());
@@ -437,44 +437,33 @@ void Form::requestReceipt() {
 	}).send();
 }
 
-void Form::processForm(const MTPpayments_PaymentForm &result) {
-	using TLForm = MTPDpayments_paymentForm;
-	using TLCredits = MTPDpayments_paymentFormStars;
-	result.match([&](const auto &data) {
-		_session->data().processUsers(data.vusers());
-
-		data.vinvoice().match([&](const auto &data) {
-			processInvoice(data);
-		});
-	});
+void Form::processForm(const MTPDpayments_paymentForm &data) {
+	_session->data().processUsers(data.vusers());
 
-	processDetails(result);
-	result.match([&](const TLForm &data) {
-		if (const auto info = data.vsaved_info()) {
-			info->match([&](const auto &data) {
-				processSavedInformation(data);
-			});
-		}
-	}, [](const TLCredits &) {
+	data.vinvoice().match([&](const auto &data) {
+		processInvoice(data);
 	});
+	processDetails(data);
+	if (const auto info = data.vsaved_info()) {
+		info->match([&](const auto &data) {
+			processSavedInformation(data);
+		});
+	}
 	_paymentMethod.savedCredentials.clear();
 	_paymentMethod.savedCredentialsIndex = 0;
-	result.match([&](const TLForm &data) {
-		if (const auto credentials = data.vsaved_credentials()) {
-			_paymentMethod.savedCredentials.reserve(credentials->v.size());
-			for (const auto &saved : credentials->v) {
-				_paymentMethod.savedCredentials.push_back({
-					.id = qs(saved.data().vid()),
-					.title = qs(saved.data().vtitle()),
-				});
-			}
-			refreshPaymentMethodDetails();
-		}
-		if (const auto additional = data.vadditional_methods()) {
-			processAdditionalPaymentMethods(additional->v);
+	if (const auto credentials = data.vsaved_credentials()) {
+		_paymentMethod.savedCredentials.reserve(credentials->v.size());
+		for (const auto &saved : credentials->v) {
+			_paymentMethod.savedCredentials.push_back({
+				.id = qs(saved.data().vid()),
+				.title = qs(saved.data().vtitle()),
+			});
 		}
-	}, [](const TLCredits &) {
-	});
+		refreshPaymentMethodDetails();
+	}
+	if (const auto additional = data.vadditional_methods()) {
+		processAdditionalPaymentMethods(additional->v);
+	}
 	fillPaymentMethodInformation();
 	_updates.fire(FormReady{});
 }
@@ -548,44 +537,31 @@ void Form::processInvoice(const MTPDinvoice &data) {
 	};
 }
 
-void Form::processDetails(const MTPpayments_PaymentForm &result) {
-	using TLForm = MTPDpayments_paymentForm;
-	using TLCredits = MTPDpayments_paymentFormStars;
-	_details = result.match([&](const TLForm &data) {
-		const auto nativeParams = data.vnative_params();
-		auto nativeParamsJson = nativeParams
-			? nativeParams->match(
-				[&](const MTPDdataJSON &data) { return data.vdata().v; })
-			: QByteArray();
-		return FormDetails{
-			.formId = data.vform_id().v,
-			.url = qs(data.vurl()),
-			.nativeProvider = qs(data.vnative_provider().value_or_empty()),
-			.nativeParamsJson = std::move(nativeParamsJson),
-			.botId = data.vbot_id().v,
-			.providerId = data.vprovider_id().v,
-			.canSaveCredentials = data.is_can_save_credentials(),
-			.passwordMissing = data.is_password_missing(),
-		};
-	}, [](const TLCredits &data) {
-		return FormDetails{
-			.formId = data.vform_id().v,
-			.botId = data.vbot_id().v,
-		};
-	});
-	_invoice.cover.title = result.match([](const auto &data) {
-		return qs(data.vtitle());
-	});
+void Form::processDetails(const MTPDpayments_paymentForm &data) {
+	const auto nativeParams = data.vnative_params();
+	auto nativeParamsJson = nativeParams
+		? nativeParams->match(
+			[&](const MTPDdataJSON &data) { return data.vdata().v; })
+		: QByteArray();
+	_details = FormDetails{
+		.formId = data.vform_id().v,
+		.url = qs(data.vurl()),
+		.nativeProvider = qs(data.vnative_provider().value_or_empty()),
+		.nativeParamsJson = std::move(nativeParamsJson),
+		.botId = data.vbot_id().v,
+		.providerId = data.vprovider_id().v,
+		.canSaveCredentials = data.is_can_save_credentials(),
+		.passwordMissing = data.is_password_missing(),
+	};
+	_invoice.cover.title = qs(data.vtitle());
 	_invoice.cover.description = TextUtilities::ParseEntities(
-		result.match([](const auto &d) { return qs(d.vdescription()); }),
+		qs(data.vdescription()),
 		TextParseLinks | TextParseMultiline);
 	if (_invoice.cover.thumbnail.isNull() && !_thumbnailLoadProcess) {
-		result.match([&](const auto &data) {
-			if (const auto photo = data.vphoto()) {
-				loadThumbnail(
-					_session->data().photoFromWeb(*photo, ImageLocation()));
-			}
-		});
+		if (const auto photo = data.vphoto()) {
+			loadThumbnail(
+				_session->data().photoFromWeb(*photo, ImageLocation()));
+		}
 	}
 	if (const auto botId = _details.botId) {
 		if (const auto bot = _session->data().userLoaded(botId)) {
diff --git a/Telegram/SourceFiles/payments/payments_form.h b/Telegram/SourceFiles/payments/payments_form.h
index 609af8213d1fa..6507ffa1386eb 100644
--- a/Telegram/SourceFiles/payments/payments_form.h
+++ b/Telegram/SourceFiles/payments/payments_form.h
@@ -313,11 +313,11 @@ class Form final : public base::has_weak_ptr {
 
 	void requestForm();
 	void requestReceipt();
-	void processForm(const MTPpayments_PaymentForm &result);
+	void processForm(const MTPDpayments_paymentForm &data);
 	void processReceipt(const MTPDpayments_paymentReceipt &data);
 	void processReceipt(const MTPDpayments_paymentReceiptStars &data);
 	void processInvoice(const MTPDinvoice &data);
-	void processDetails(const MTPpayments_PaymentForm &result);
+	void processDetails(const MTPDpayments_paymentForm &data);
 	void processDetails(const MTPDpayments_paymentReceipt &data);
 	void processDetails(const MTPDpayments_paymentReceiptStars &data);
 	void processSavedInformation(const MTPDpaymentRequestedInfo &data);

From e9fb580ba42311d5ab0f75f75d77a5616139e5ec Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 21:13:14 +0300
Subject: [PATCH 256/400] Moved out credits currency to single place.

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

diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index 8cdd0b9a2cc59..c6ddd84a9f3e8 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -27,6 +27,7 @@ For license and copyright information please follow this link:
 #include "smartglocal/smartglocal_token.h"
 #include "storage/storage_account.h"
 #include "ui/image/image.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_entity.h"
 #include "apiwrap.h"
 #include "core/core_cloud_password.h"
@@ -385,7 +386,7 @@ void Form::requestForm() {
 			const auto amount = tlPrices.empty()
 				? 0
 				: tlPrices.front().data().vamount().v;
-			if (currency != "XTR" || !amount) {
+			if (currency != ::Ui::kCreditsCurrency || !amount) {
 				using Type = Error::Type;
 				_updates.fire(Error{ Type::Form, u"Bad Stars Form."_q });
 				return;
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index 3669576d9af98..47232ac8acb12 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "payments/payments_form.h"
 #include "history/history_item.h"
 #include "ui/layers/generic_box.h"
+#include "ui/text/format_values.h"
 #include "window/window_session_controller.h"
 #include "boxes/send_credits_box.h"
 
@@ -20,7 +21,7 @@ namespace {
 bool IsCreditsInvoice(not_null<HistoryItem*> item) {
 	const auto media = item->media();
 	const auto invoice = media ? media->invoice() : nullptr;
-	return invoice && (invoice->currency == "XTR");
+	return invoice && (invoice->currency == Ui::kCreditsCurrency);
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/ui/text/format_values.h b/Telegram/SourceFiles/ui/text/format_values.h
index b73775118af27..e4294eed1526f 100644
--- a/Telegram/SourceFiles/ui/text/format_values.h
+++ b/Telegram/SourceFiles/ui/text/format_values.h
@@ -13,6 +13,8 @@ inline constexpr auto FileStatusSizeReady = 0xFFFFFFF0LL;
 inline constexpr auto FileStatusSizeLoaded = 0xFFFFFFF1LL;
 inline constexpr auto FileStatusSizeFailed = 0xFFFFFFF2LL;
 
+inline const QString kCreditsCurrency = u"XTR"_q;
+
 [[nodiscard]] QString FormatSizeText(qint64 size);
 [[nodiscard]] QString FormatDownloadText(qint64 ready, qint64 total);
 [[nodiscard]] QString FormatProgressText(qint64 ready, qint64 total);

From a2a27e115cf9b315dd1c93f5b42831349c9e5080 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 21:55:19 +0300
Subject: [PATCH 257/400] Moved out box for credits history entries to single
 place.

---
 .../SourceFiles/settings/settings_credits.cpp | 235 +++++++++---------
 .../SourceFiles/settings/settings_credits.h   |  17 ++
 2 files changed, 139 insertions(+), 113 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 1b9efbe073920..c0286004512be 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -465,120 +465,12 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 		}, inner->lifetime());
 
 		const auto controller = _controller->parentController();
-		const auto entryBox = [=](
-				not_null<Ui::GenericBox*> box,
-				const Data::CreditsHistoryEntry &e) {
-			box->setStyle(st::giveawayGiftCodeBox);
-			box->setNoContentMargin(true);
-
-			const auto content = box->verticalLayout();
-			Ui::AddSkip(content);
-			Ui::AddSkip(content);
-			Ui::AddSkip(content);
-
-			using Type = Data::CreditsHistoryEntry::PeerType;
-
-			const auto &stUser = st::boostReplaceUserpic;
-			const auto peer = (e.peerType == Type::PremiumBot)
-				? premiumBot.get()
-				: e.bareId
-				? _controller->session().data().peer(PeerId(e.bareId)).get()
-				: nullptr;
-			if (peer) {
-				content->add(object_ptr<Ui::CenterWrap<>>(
-					content,
-					object_ptr<Ui::UserpicButton>(content, peer, stUser)));
-			} else {
-				const auto widget = content->add(
-					object_ptr<Ui::CenterWrap<>>(
-						content,
-						object_ptr<Ui::RpWidget>(content)))->entity();
-				using Draw = Fn<void(Painter &, int, int, int, int)>;
-				const auto draw = widget->lifetime().make_state<Draw>(
-					Ui::GenerateCreditsPaintUserpicCallback(e));
-				widget->resize(Size(stUser.photoSize));
-				widget->paintRequest(
-				) | rpl::start_with_next([=] {
-					auto p = Painter(widget);
-					(*draw)(p, 0, 0, stUser.photoSize, stUser.photoSize);
-				}, widget->lifetime());
-			}
-
-			Ui::AddSkip(content);
-			Ui::AddSkip(content);
-
-
-			box->addRow(object_ptr<Ui::CenterWrap<>>(
-				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					rpl::single(peer
-						? peer->name()
-						: Ui::GenerateEntryName(e).text),
-					st::creditsBoxAboutTitle)));
-
-			Ui::AddSkip(content);
-
-			{
-				constexpr auto kMinus = QChar(0x2212);
-				auto &lifetime = content->lifetime();
-				const auto text = lifetime.make_state<Ui::Text::String>(
-					st::semiboldTextStyle,
-					(!e.bareId ? QChar('+') : kMinus)
-						+ Lang::FormatCountDecimal(e.credits));
-
-				const auto amount = content->add(
-					object_ptr<Ui::FixedHeightWidget>(
-						content,
-						_star.height() / style::DevicePixelRatio()));
-				const auto font = text->style()->font;
-				amount->paintRequest(
-				) | rpl::start_with_next([=] {
-					auto p = Painter(amount);
-					const auto starWidth = _star.width()
-						/ style::DevicePixelRatio();
-					const auto fullWidth = text->maxWidth()
-						+ font->spacew * 2
-						+ starWidth;
-					p.setPen(!e.bareId
-						? st::boxTextFgGood
-						: st::menuIconAttentionColor);
-					const auto x = (amount->width() - fullWidth) / 2;
-					text->draw(p, Ui::Text::PaintContext{
-						.position = QPoint(
-							x,
-							(amount->height() - font->height) / 2),
-						.outerWidth = amount->width(),
-						.availableWidth = amount->width(),
-					});;
-					p.drawImage(
-						x + fullWidth - starWidth,
-						0,
-						_star);
-				}, amount->lifetime());
-			}
-
-			Ui::AddSkip(content);
-			Ui::AddSkip(content);
-
-			AddCreditsHistoryEntryTable(
-				controller,
-				box->verticalLayout(),
-				e);
-
-			const auto button = box->addButton(tr::lng_box_ok(), [=] {
-				box->closeBox();
-			});
-			const auto buttonWidth = st::boxWidth
-				- 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 entryClicked = [=](const Data::CreditsHistoryEntry &e) {
-			controller->uiShow()->show(Box(entryBox, e));
+			controller->uiShow()->show(Box(
+				ReceiptCreditsBox,
+				controller,
+				premiumBot.get(),
+				e));
 		};
 
 		Info::Statistics::AddCreditsHistoryList(
@@ -847,4 +739,121 @@ not_null<Ui::RpWidget*> AddBalanceWidget(
 	return balance;
 }
 
+void ReceiptCreditsBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		PeerData *premiumBot,
+		const Data::CreditsHistoryEntry &e) {
+	box->setStyle(st::giveawayGiftCodeBox);
+	box->setNoContentMargin(true);
+
+	const auto star = GenerateStars(st::creditsTopupButton.height, 1);
+
+	const auto content = box->verticalLayout();
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	using Type = Data::CreditsHistoryEntry::PeerType;
+
+	const auto &stUser = st::boostReplaceUserpic;
+	const auto peer = (e.peerType == Type::PremiumBot)
+		? premiumBot
+		: e.bareId
+		? controller->session().data().peer(PeerId(e.bareId)).get()
+		: nullptr;
+	if (peer) {
+		content->add(object_ptr<Ui::CenterWrap<>>(
+			content,
+			object_ptr<Ui::UserpicButton>(content, peer, stUser)));
+	} else {
+		const auto widget = content->add(
+			object_ptr<Ui::CenterWrap<>>(
+				content,
+				object_ptr<Ui::RpWidget>(content)))->entity();
+		using Draw = Fn<void(Painter &, int, int, int, int)>;
+		const auto draw = widget->lifetime().make_state<Draw>(
+			Ui::GenerateCreditsPaintUserpicCallback(e));
+		widget->resize(Size(stUser.photoSize));
+		widget->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = Painter(widget);
+			(*draw)(p, 0, 0, stUser.photoSize, stUser.photoSize);
+		}, widget->lifetime());
+	}
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+
+	box->addRow(object_ptr<Ui::CenterWrap<>>(
+		box,
+		object_ptr<Ui::FlatLabel>(
+			box,
+			rpl::single(peer
+				? peer->name()
+				: Ui::GenerateEntryName(e).text),
+			st::creditsBoxAboutTitle)));
+
+	Ui::AddSkip(content);
+
+	{
+		constexpr auto kMinus = QChar(0x2212);
+		auto &lifetime = content->lifetime();
+		const auto text = lifetime.make_state<Ui::Text::String>(
+			st::semiboldTextStyle,
+			(!e.bareId ? QChar('+') : kMinus)
+				+ Lang::FormatCountDecimal(e.credits));
+
+		const auto amount = content->add(
+			object_ptr<Ui::FixedHeightWidget>(
+				content,
+				star.height() / style::DevicePixelRatio()));
+		const auto font = text->style()->font;
+		amount->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = Painter(amount);
+			const auto starWidth = star.width()
+				/ style::DevicePixelRatio();
+			const auto fullWidth = text->maxWidth()
+				+ font->spacew * 2
+				+ starWidth;
+			p.setPen(!e.bareId
+				? st::boxTextFgGood
+				: st::menuIconAttentionColor);
+			const auto x = (amount->width() - fullWidth) / 2;
+			text->draw(p, Ui::Text::PaintContext{
+				.position = QPoint(
+					x,
+					(amount->height() - font->height) / 2),
+				.outerWidth = amount->width(),
+				.availableWidth = amount->width(),
+			});;
+			p.drawImage(
+				x + fullWidth - starWidth,
+				0,
+				star);
+		}, amount->lifetime());
+	}
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	AddCreditsHistoryEntryTable(
+		controller,
+		box->verticalLayout(),
+		e);
+
+	const auto button = box->addButton(tr::lng_box_ok(), [=] {
+		box->closeBox();
+	});
+	const auto buttonWidth = st::boxWidth
+		- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
+	button->widthValue() | rpl::filter([=] {
+		return (button->widthNoMargins() != buttonWidth);
+	}) | rpl::start_with_next([=] {
+		button->resizeToWidth(buttonWidth);
+	}, button->lifetime());
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_credits.h b/Telegram/SourceFiles/settings/settings_credits.h
index 2267a0cd56a44..9f0d97ee0459e 100644
--- a/Telegram/SourceFiles/settings/settings_credits.h
+++ b/Telegram/SourceFiles/settings/settings_credits.h
@@ -9,7 +9,18 @@ For license and copyright information please follow this link:
 
 #include "settings/settings_type.h"
 
+class PeerData;
+
+namespace Data {
+struct CreditsHistoryEntry;
+} // namespace Data
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Ui {
+class GenericBox;
 class RpWidget;
 } // namespace Ui
 
@@ -22,5 +33,11 @@ namespace Settings {
 	rpl::producer<uint64> balanceValue,
 	bool rightAlign);
 
+void ReceiptCreditsBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionController*> controller,
+	PeerData *premiumBot,
+	const Data::CreditsHistoryEntry &e);
+
 } // namespace Settings
 

From 93eff78cd6527b097adcfa218787c1be6c12e86c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 21:55:27 +0300
Subject: [PATCH 258/400] Replaced all credits currency name at least with
 simple star.

---
 Telegram/SourceFiles/ui/text/format_values.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/ui/text/format_values.cpp b/Telegram/SourceFiles/ui/text/format_values.cpp
index a5115acf2cb05..d950623137a69 100644
--- a/Telegram/SourceFiles/ui/text/format_values.cpp
+++ b/Telegram/SourceFiles/ui/text/format_values.cpp
@@ -147,6 +147,9 @@ QString FillAmountAndCurrency(
 	Expects(amount != std::numeric_limits<int64>::min());
 
 	const auto rule = LookupCurrencyRule(currency);
+	if (currency == kCreditsCurrency) {
+		return QChar(0x2B50) + Lang::FormatCountDecimal(std::abs(amount));
+	}
 
 	const auto prefix = (amount < 0)
 		? QString::fromUtf8("\xe2\x88\x92")

From c27c567225affbb8bca12452192775e31bc463ed Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 22:20:41 +0300
Subject: [PATCH 259/400] Added initial support for non-panel credits receipts.

---
 Telegram/SourceFiles/history/history_item.cpp |  1 +
 .../history/history_item_components.h         |  1 +
 .../payments/payments_checkout_process.cpp    |  5 ++++
 .../payments/payments_checkout_process.h      |  5 +++-
 .../SourceFiles/payments/payments_form.cpp    | 20 +++++++++-----
 Telegram/SourceFiles/payments/payments_form.h | 14 ++++++++++
 .../payments/payments_non_panel_process.cpp   | 27 +++++++++++++++++--
 7 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index c1af45c5f7271..88983c5800bd5 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -3941,6 +3941,7 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 		payment->slug = data.vinvoice_slug().value_or_empty();
 		payment->recurringInit = data.is_recurring_init();
 		payment->recurringUsed = data.is_recurring_used();
+		payment->isCreditsCurrency = (currency == Ui::kCreditsCurrency);
 		payment->amount = Ui::FillAmountAndCurrency(amount, currency);
 		payment->invoiceLink = std::make_shared<LambdaClickHandler>([=](
 				ClickContext context) {
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 906fe18cebf63..8d262a52e3098 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -653,6 +653,7 @@ struct HistoryServicePayment
 	ClickHandlerPtr invoiceLink;
 	bool recurringInit = false;
 	bool recurringUsed = false;
+	bool isCreditsCurrency = false;
 };
 
 struct HistoryServiceSameBackground
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index 597d7687b9889..3080c149bfc68 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -415,6 +415,11 @@ void CheckoutProcess::handleFormUpdate(const FormUpdate &update) {
 			_nonPanelPaymentFormProcess(
 				std::make_shared<CreditsFormData>(data.data));
 		}
+	}, [&](const CreditsReceiptReady &data) {
+		if (_nonPanelPaymentFormProcess) {
+			_nonPanelPaymentFormProcess(
+				std::make_shared<CreditsReceiptData>(data.data));
+		}
 	}, [&](const Error &error) {
 		handleError(error);
 	});
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.h b/Telegram/SourceFiles/payments/payments_checkout_process.h
index 2f939d5a68b60..3c7f112ca5d24 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.h
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.h
@@ -41,6 +41,7 @@ struct InvoiceCredits;
 struct InvoiceId;
 struct InvoicePremiumGiftCode;
 struct CreditsFormData;
+struct CreditsReceiptData;
 
 enum class Mode {
 	Payment,
@@ -54,7 +55,9 @@ enum class CheckoutResult {
 	Failed,
 };
 
-struct NonPanelPaymentForm : std::variant<std::shared_ptr<CreditsFormData>> {
+struct NonPanelPaymentForm : std::variant<
+	std::shared_ptr<CreditsFormData>,
+	std::shared_ptr<CreditsReceiptData>> {
 	using variant::variant;
 };
 
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index c6ddd84a9f3e8..8dac6d0c55542 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -499,12 +499,20 @@ void Form::processReceipt(const MTPDpayments_paymentReceipt &data) {
 void Form::processReceipt(const MTPDpayments_paymentReceiptStars &data) {
 	_session->data().processUsers(data.vusers());
 
-	data.vinvoice().match([&](const auto &data) {
-		processInvoice(data);
-	});
-	processDetails(data);
-	fillPaymentMethodInformation();
-	_updates.fire(FormReady{});
+	const auto receiptData = CreditsReceiptData{
+		.id = qs(data.vtransaction_id()),
+		.title = qs(data.vtitle()),
+		.description = qs(data.vdescription()),
+		.photo = data.vphoto()
+			? _session->data().photoFromWeb(
+				*data.vphoto(),
+				ImageLocation())
+			: nullptr,
+		.peerId = peerFromUser(data.vbot_id().v),
+		.credits = data.vtotal_amount().v,
+		.date = data.vdate().v,
+	};
+	_updates.fire(CreditsReceiptReady{ .data = receiptData });
 }
 
 void Form::processInvoice(const MTPDinvoice &data) {
diff --git a/Telegram/SourceFiles/payments/payments_form.h b/Telegram/SourceFiles/payments/payments_form.h
index 6507ffa1386eb..cf4cef890372b 100644
--- a/Telegram/SourceFiles/payments/payments_form.h
+++ b/Telegram/SourceFiles/payments/payments_form.h
@@ -187,6 +187,16 @@ struct CreditsFormData {
 	MTPInputInvoice inputInvoice;
 };
 
+struct CreditsReceiptData {
+	QString id;
+	QString title;
+	QString description;
+	PhotoData *photo = nullptr;
+	PeerId peerId = PeerId(0);
+	uint64 credits = 0;
+	TimeId date = 0;
+};
+
 struct ToggleProgress {
 	bool shown = true;
 };
@@ -212,6 +222,9 @@ struct PaymentFinished {
 struct CreditsPaymentStarted {
 	CreditsFormData data;
 };
+struct CreditsReceiptReady {
+	CreditsReceiptData data;
+};
 struct Error {
 	enum class Type {
 		None,
@@ -244,6 +257,7 @@ struct FormUpdate : std::variant<
 	BotTrustRequired,
 	PaymentFinished,
 	CreditsPaymentStarted,
+	CreditsReceiptReady,
 	Error> {
 	using variant::variant;
 };
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index 47232ac8acb12..2369d3d5d4a4e 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -7,18 +7,25 @@ For license and copyright information please follow this link:
 */
 #include "payments/payments_non_panel_process.h"
 
+#include "base/unixtime.h"
+#include "boxes/send_credits_box.h"
+#include "data/data_credits.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "payments/payments_checkout_process.h" // NonPanelPaymentForm.
 #include "payments/payments_form.h"
-#include "history/history_item.h"
+#include "settings/settings_credits.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/format_values.h"
 #include "window/window_session_controller.h"
-#include "boxes/send_credits_box.h"
 
 namespace Payments {
 namespace {
 
 bool IsCreditsInvoice(not_null<HistoryItem*> item) {
+	if (const auto payment = item->Get<HistoryServicePayment>()) {
+		return payment->isCreditsCurrency;
+	}
 	const auto media = item->media();
 	const auto invoice = media ? media->invoice() : nullptr;
 	return invoice && (invoice->currency == Ui::kCreditsCurrency);
@@ -30,9 +37,25 @@ Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
 		not_null<Window::SessionController*> controller) {
 	return [=](NonPanelPaymentForm form) {
 		using CreditsFormDataPtr = std::shared_ptr<CreditsFormData>;
+		using CreditsReceiptPtr = std::shared_ptr<CreditsReceiptData>;
 		if (const auto creditsData = std::get_if<CreditsFormDataPtr>(&form)) {
 			controller->uiShow()->show(Box(Ui::SendCreditsBox, *creditsData));
 		}
+		if (const auto r = std::get_if<CreditsReceiptPtr>(&form)) {
+			const auto receipt = *r;
+			const auto entry = Data::CreditsHistoryEntry{
+				.id = receipt->id,
+				.credits = receipt->credits,
+				.date = base::unixtime::parse(receipt->date),
+				.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
+				.bareId = receipt->peerId.value,
+			};
+			controller->uiShow()->show(Box(
+				Settings::ReceiptCreditsBox,
+				controller,
+				nullptr,
+				entry));
+		}
 	};
 }
 

From 1edf0ed70b429e06aee2a0859f283be27ebd18ac Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 22:41:51 +0300
Subject: [PATCH 260/400] Moved out widget of photo for credits history entries
 to single place.

---
 .../SourceFiles/boxes/send_credits_box.cpp    | 46 ++---------------
 .../SourceFiles/settings/settings_credits.cpp | 49 +++++++++++++++++++
 .../SourceFiles/settings/settings_credits.h   |  8 +++
 3 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 445bc9029db60..595434d99c40c 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -11,8 +11,6 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "core/ui_integration.h" // Core::MarkedTextContext.
 #include "data/data_credits.h"
-#include "data/data_file_origin.h"
-#include "data/data_photo_media.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
@@ -94,47 +92,9 @@ void SendCreditsBox(
 	const auto bot = session->data().user(form->botId);
 
 	if (form->photo) {
-		struct State {
-			std::shared_ptr<Data::PhotoMedia> view;
-			Image *image = nullptr;
-			rpl::lifetime downloadLifetime;
-		};
-		const auto state = content->lifetime().make_state<State>();
-		const auto widget = box->addRow(
-			object_ptr<Ui::CenterWrap<>>(
-				content,
-				object_ptr<Ui::RpWidget>(content)))->entity();
-		state->view = form->photo->createMediaView();
-		form->photo->load(Data::PhotoSize::Thumbnail, {});
-
-		widget->resize(Size(photoSize));
-
-		rpl::single(rpl::empty_value()) | rpl::then(
-			session->downloaderTaskFinished()
-		) | rpl::start_with_next([=] {
-			using Size = Data::PhotoSize;
-			if (const auto large = state->view->image(Size::Large)) {
-				state->image = large;
-			} else if (const auto small = state->view->image(Size::Small)) {
-				state->image = small;
-			} else if (const auto t = state->view->image(Size::Thumbnail)) {
-				state->image = t;
-			}
-			widget->update();
-			if (state->view->loaded()) {
-				state->downloadLifetime.destroy();
-			}
-		}, state->downloadLifetime);
-
-		widget->paintRequest(
-		) | rpl::start_with_next([=] {
-			auto p = QPainter(widget);
-			if (state->image) {
-				p.drawPixmap(0, 0, state->image->pix(widget->width(), {
-					.options = Images::Option::RoundCircle,
-				}));
-			}
-		}, widget->lifetime());
+		box->addRow(object_ptr<Ui::CenterWrap<>>(
+			content,
+			Settings::HistoryEntryPhoto(content, form->photo, photoSize)));
 	} else {
 		const auto widget = box->addRow(
 			object_ptr<Ui::CenterWrap<>>(
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index c0286004512be..e9a01aa0a351e 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -10,6 +10,8 @@ For license and copyright information please follow this link:
 #include "api/api_credits.h"
 #include "boxes/gift_premium_box.h"
 #include "core/click_handler_types.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo_media.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
@@ -856,4 +858,51 @@ void ReceiptCreditsBox(
 	}, button->lifetime());
 }
 
+object_ptr<Ui::RpWidget> HistoryEntryPhoto(
+		not_null<Ui::RpWidget*> parent,
+		not_null<PhotoData*> photo,
+		int photoSize) {
+	struct State {
+		std::shared_ptr<Data::PhotoMedia> view;
+		Image *image = nullptr;
+		rpl::lifetime downloadLifetime;
+	};
+	const auto state = parent->lifetime().make_state<State>();
+	auto owned = object_ptr<Ui::RpWidget>(parent);
+	const auto widget = owned.data();
+	state->view = photo->createMediaView();
+	photo->load(Data::PhotoSize::Thumbnail, {});
+
+	widget->resize(Size(photoSize));
+
+	rpl::single(rpl::empty_value()) | rpl::then(
+		photo->owner().session().downloaderTaskFinished()
+	) | rpl::start_with_next([=] {
+		using Size = Data::PhotoSize;
+		if (const auto large = state->view->image(Size::Large)) {
+			state->image = large;
+		} else if (const auto small = state->view->image(Size::Small)) {
+			state->image = small;
+		} else if (const auto t = state->view->image(Size::Thumbnail)) {
+			state->image = t;
+		}
+		widget->update();
+		if (state->view->loaded()) {
+			state->downloadLifetime.destroy();
+		}
+	}, state->downloadLifetime);
+
+	widget->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(widget);
+		if (state->image) {
+			p.drawPixmap(0, 0, state->image->pix(widget->width(), {
+				.options = Images::Option::RoundCircle,
+			}));
+		}
+	}, widget->lifetime());
+
+	return owned;
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_credits.h b/Telegram/SourceFiles/settings/settings_credits.h
index 9f0d97ee0459e..32eba05db71d9 100644
--- a/Telegram/SourceFiles/settings/settings_credits.h
+++ b/Telegram/SourceFiles/settings/settings_credits.h
@@ -9,6 +9,9 @@ For license and copyright information please follow this link:
 
 #include "settings/settings_type.h"
 
+template <typename Object>
+class object_ptr;
+
 class PeerData;
 
 namespace Data {
@@ -39,5 +42,10 @@ void ReceiptCreditsBox(
 	PeerData *premiumBot,
 	const Data::CreditsHistoryEntry &e);
 
+[[nodiscard]] object_ptr<Ui::RpWidget> HistoryEntryPhoto(
+	not_null<Ui::RpWidget*> parent,
+	not_null<PhotoData*> photo,
+	int photoSize);
+
 } // namespace Settings
 

From 58da617e3f4f1a32fe7172a6eb7cefc87a42742b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 22:52:47 +0300
Subject: [PATCH 261/400] Added description and optional photo to credits
 receipts.

---
 Telegram/SourceFiles/api/api_credits.cpp      | 26 +++++++++++++------
 Telegram/SourceFiles/data/data_credits.h      |  8 ++++--
 .../boosts/giveaway/giveaway.style            |  4 +--
 .../payments/payments_non_panel_process.cpp   |  8 ++++--
 .../SourceFiles/settings/settings_credits.cpp | 24 +++++++++++++++--
 5 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 1604d6d5ce650..453d9536f3bd4 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "base/unixtime.h"
 #include "data/data_peer.h"
+#include "data/data_photo.h"
 #include "data/data_session.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
@@ -21,12 +22,24 @@ namespace Api {
 namespace {
 
 [[nodiscard]] Data::CreditsHistoryEntry HistoryFromTL(
-		const MTPStarsTransaction &tl) {
+		const MTPStarsTransaction &tl,
+		not_null<PeerData*> peer) {
 	using HistoryPeerTL = MTPDstarsTransactionPeer;
+	const auto photo = tl.data().vphoto()
+		? peer->owner().photoFromWeb(*tl.data().vphoto(), ImageLocation())
+		: nullptr;
 	return Data::CreditsHistoryEntry{
 		.id = qs(tl.data().vid()),
-		.credits = tl.data().vstars().v,
+		.title = qs(tl.data().vtitle().value_or_empty()),
+		.description = qs(tl.data().vdescription().value_or_empty()),
 		.date = base::unixtime::parse(tl.data().vdate().v),
+		.photoId = photo ? photo->id : 0,
+		.credits = tl.data().vstars().v,
+		.bareId = tl.data().vpeer().match([](const HistoryPeerTL &p) {
+			return peerFromMTP(p.vpeer());
+		}, [](const auto &) {
+			return PeerId(0);
+		}).value,
 		.peerType = tl.data().vpeer().match([](const HistoryPeerTL &) {
 			return Data::CreditsHistoryEntry::PeerType::Peer;
 		}, [](const MTPDstarsTransactionPeerPlayMarket &) {
@@ -40,11 +53,6 @@ namespace {
 		}, [](const MTPDstarsTransactionPeerPremiumBot &) {
 			return Data::CreditsHistoryEntry::PeerType::PremiumBot;
 		}),
-		.bareId = tl.data().vpeer().match([](const HistoryPeerTL &p) {
-			return peerFromMTP(p.vpeer());
-		}, [](const auto &) {
-			return PeerId(0);
-		}).value,
 	};
 }
 
@@ -56,7 +64,9 @@ namespace {
 	return Data::CreditsStatusSlice{
 		.list = ranges::views::all(
 			status.data().vhistory().v
-		) | ranges::views::transform(HistoryFromTL) | ranges::to_vector,
+		) | ranges::views::transform([&](const MTPStarsTransaction &tl) {
+			return HistoryFromTL(tl, peer);
+		}) | ranges::to_vector,
 		.balance = status.data().vbalance().v,
 		.allLoaded = !status.data().vnext_offset().has_value(),
 		.token = qs(status.data().vnext_offset().value_or_empty()),
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 7a241c87a9a00..af830e26c8b8d 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -20,6 +20,7 @@ struct CreditTopupOption final {
 using CreditTopupOptions = std::vector<CreditTopupOption>;
 
 struct CreditsHistoryEntry final {
+	using PhotoId = uint64;
 	enum class PeerType {
 		Peer,
 		AppStore,
@@ -29,10 +30,13 @@ struct CreditsHistoryEntry final {
 		PremiumBot,
 	};
 	QString id;
-	uint64 credits = 0;
+	QString title;
+	QString description;
 	QDateTime date;
-	PeerType peerType;
+	PhotoId photoId = 0;
+	uint64 credits = 0;
 	uint64 bareId = 0;
+	PeerType peerType;
 };
 
 struct CreditsStatusSlice final {
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
index ef705ab2a86f3..2715dfe9586f6 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
@@ -96,8 +96,8 @@ giveawayGiftCodeValue: FlatLabel(defaultFlatLabel) {
 	}
 }
 giveawayGiftCodeValueMultiline: FlatLabel(giveawayGiftCodeValue) {
-	minWidth: 100px;
-	maxHeight: 0px;
+	minWidth: 128px;
+	maxHeight: 100px;
 }
 giveawayGiftCodeValueMargin: margins(13px, 9px, 13px, 9px);
 giveawayGiftCodePeerMargin: margins(11px, 6px, 11px, 4px);
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index 2369d3d5d4a4e..5ff5a07f36d7d 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "boxes/send_credits_box.h"
 #include "data/data_credits.h"
+#include "data/data_photo.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h"
 #include "payments/payments_checkout_process.h" // NonPanelPaymentForm.
@@ -45,10 +46,13 @@ Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
 			const auto receipt = *r;
 			const auto entry = Data::CreditsHistoryEntry{
 				.id = receipt->id,
-				.credits = receipt->credits,
+				.title = receipt->title,
+				.description = receipt->description,
 				.date = base::unixtime::parse(receipt->date),
-				.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
+				.photoId = receipt->photo ? receipt->photo->id : 0,
+				.credits = receipt->credits,
 				.bareId = receipt->peerId.value,
+				.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
 			};
 			controller->uiShow()->show(Box(
 				Settings::ReceiptCreditsBox,
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index e9a01aa0a351e..0eec25cf4e602 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -764,7 +764,14 @@ void ReceiptCreditsBox(
 		: e.bareId
 		? controller->session().data().peer(PeerId(e.bareId)).get()
 		: nullptr;
-	if (peer) {
+	const auto photo = e.photoId
+		? controller->session().data().photo(e.photoId).get()
+		: nullptr;
+	if (photo) {
+		content->add(object_ptr<Ui::CenterWrap<>>(
+			content,
+			HistoryEntryPhoto(content, photo, stUser.photoSize)));
+	} else if (peer) {
 		content->add(object_ptr<Ui::CenterWrap<>>(
 			content,
 			object_ptr<Ui::UserpicButton>(content, peer, stUser)));
@@ -792,7 +799,10 @@ void ReceiptCreditsBox(
 		box,
 		object_ptr<Ui::FlatLabel>(
 			box,
-			rpl::single(peer
+			rpl::single(
+				!e.title.isEmpty()
+				? e.title
+				: peer
 				? peer->name()
 				: Ui::GenerateEntryName(e).text),
 			st::creditsBoxAboutTitle)));
@@ -838,6 +848,16 @@ void ReceiptCreditsBox(
 		}, amount->lifetime());
 	}
 
+	if (!e.description.isEmpty()) {
+		Ui::AddSkip(content);
+		box->addRow(object_ptr<Ui::CenterWrap<>>(
+			box,
+			object_ptr<Ui::FlatLabel>(
+				box,
+				rpl::single(e.description),
+				st::defaultFlatLabel)));
+	}
+
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 

From 3c246e1e92f08fabfe0efa68ea70467a23d9b322 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 23:09:14 +0300
Subject: [PATCH 262/400] Split functions for credits settings.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../SourceFiles/boxes/send_credits_box.cpp    |   2 +-
 .../payments/payments_non_panel_process.cpp   |   2 +-
 .../SourceFiles/settings/settings_credits.cpp | 347 +---------------
 .../SourceFiles/settings/settings_credits.h   |  34 --
 .../settings/settings_credits_graphics.cpp    | 391 ++++++++++++++++++
 .../settings/settings_credits_graphics.h      |  49 +++
 7 files changed, 446 insertions(+), 381 deletions(-)
 create mode 100644 Telegram/SourceFiles/settings/settings_credits_graphics.cpp
 create mode 100644 Telegram/SourceFiles/settings/settings_credits_graphics.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 75ab2b48f4d63..d1171a5efed9e 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1370,6 +1370,8 @@ PRIVATE
     settings/settings_common_session.h
     settings/settings_credits.cpp
     settings/settings_credits.h
+    settings/settings_credits_graphics.cpp
+    settings/settings_credits_graphics.h
     settings/settings_experimental.cpp
     settings/settings_experimental.h
     settings/settings_folders.cpp
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 595434d99c40c..303560ab3ae08 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -22,7 +22,7 @@ For license and copyright information please follow this link:
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_form.h"
 #include "payments/payments_form.h"
-#include "settings/settings_credits.h"
+#include "settings/settings_credits_graphics.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h" // Ui::Premium::ColorizedSvg.
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index 5ff5a07f36d7d..f2874d62ec919 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -15,7 +15,7 @@ For license and copyright information please follow this link:
 #include "history/history_item_components.h"
 #include "payments/payments_checkout_process.h" // NonPanelPaymentForm.
 #include "payments/payments_form.h"
-#include "settings/settings_credits.h"
+#include "settings/settings_credits_graphics.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/format_values.h"
 #include "window/window_session_controller.h"
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 0eec25cf4e602..e2c4bcdf98214 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "settings/settings_credits.h"
 
+#include "settings/settings_credits_graphics.h"
 #include "api/api_credits.h"
 #include "boxes/gift_premium_box.h"
 #include "core/click_handler_types.h"
@@ -23,11 +24,8 @@ For license and copyright information please follow this link:
 #include "settings/settings_common_session.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/boost_box.h" // Ui::StartFireworks.
-#include "ui/controls/userpic_button.h"
-#include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h"
-#include "ui/image/image_prepare.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
@@ -37,14 +35,11 @@ For license and copyright information please follow this link:
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/labels.h"
-#include "ui/widgets/tooltip.h"
 #include "ui/wrap/fade_wrap.h"
-#include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #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"
@@ -58,47 +53,6 @@ For license and copyright information please follow this link:
 namespace Settings {
 namespace {
 
-using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
-
-class Balance final
-	: public Ui::RpWidget
-	, public Ui::AbstractTooltipShower {
-public:
-	using Ui::RpWidget::RpWidget;
-
-	void setBalance(uint64 balance) {
-		_balance = balance;
-		_tooltip = Lang::FormatCountDecimal(balance);
-	}
-
-	void enterEventHook(QEnterEvent *e) override {
-		if (_balance >= 10'000) {
-			Ui::Tooltip::Show(1000, this);
-		}
-	}
-
-	void leaveEventHook(QEvent *e) override {
-		Ui::Tooltip::Hide();
-	}
-
-	QString tooltipText() const override {
-		return _tooltip;
-	}
-
-	QPoint tooltipPos() const override {
-		return QCursor::pos();
-	}
-
-	bool tooltipWindowActive() const override {
-		return Ui::AppInFocus() && Ui::InFocusChain(window());
-	}
-
-private:
-	QString _tooltip;
-	uint64 _balance = 0;
-
-};
-
 [[nodiscard]] uint64 UniqueIdFromOption(
 		const Data::CreditTopupOption &d) {
 	const auto string = QString::number(d.credits)
@@ -109,59 +63,6 @@ class Balance final
 	return XXH64(string.data(), string.size() * sizeof(ushort), 0);
 }
 
-[[nodiscard]] QImage GenerateStars(int height, int count) {
-	constexpr auto kOutlineWidth = .6;
-	constexpr auto kStrokeWidth = 3;
-	constexpr auto kShift = 3;
-
-	auto colorized = qs(Ui::Premium::ColorizedSvg(
-		Ui::Premium::CreditsIconGradientStops()));
-	colorized.replace(
-		u"stroke=\"none\""_q,
-		u"stroke=\"%1\""_q.arg(st::creditsStroke->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(kStrokeWidth));
-
-	const auto starSize = Size(height - kOutlineWidth * 2);
-
-	auto frame = QImage(
-		QSize(
-			(height + kShift * (count - 1)) * style::DevicePixelRatio(),
-			height * style::DevicePixelRatio()),
-		QImage::Format_ARGB32_Premultiplied);
-	frame.setDevicePixelRatio(style::DevicePixelRatio());
-	frame.fill(Qt::transparent);
-	const auto drawSingle = [&](QPainter &q) {
-		const auto s = kOutlineWidth;
-		q.save();
-		q.translate(s, s);
-		q.setCompositionMode(QPainter::CompositionMode_Clear);
-		svg.render(&q, QRectF(QPointF(s, 0), starSize));
-		svg.render(&q, QRectF(QPointF(s, s), starSize));
-		svg.render(&q, QRectF(QPointF(0, s), starSize));
-		svg.render(&q, QRectF(QPointF(-s, s), starSize));
-		svg.render(&q, QRectF(QPointF(-s, 0), starSize));
-		svg.render(&q, QRectF(QPointF(-s, -s), starSize));
-		svg.render(&q, QRectF(QPointF(0, -s), starSize));
-		svg.render(&q, QRectF(QPointF(s, -s), starSize));
-		q.setCompositionMode(QPainter::CompositionMode_SourceOver);
-		svg.render(&q, Rect(starSize));
-		q.restore();
-	};
-	{
-		auto q = QPainter(&frame);
-		q.translate(frame.width() / style::DevicePixelRatio() - height, 0);
-		for (auto i = count; i > 0; --i) {
-			drawSingle(q);
-			q.translate(-kShift, 0);
-		}
-	}
-	return frame;
-}
-
 class Credits : public Section<Credits> {
 public:
 	Credits(
@@ -228,6 +129,7 @@ rpl::producer<> Credits::sectionShowBack() {
 }
 
 void Credits::setStepDataReference(std::any &data) {
+	using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
 	const auto my = std::any_cast<SectionCustomTopBarData>(&data);
 	if (my) {
 		_backToggles = std::move(
@@ -680,249 +582,4 @@ Type CreditsId() {
 	return Credits::Id();
 }
 
-not_null<Ui::RpWidget*> AddBalanceWidget(
-		not_null<Ui::RpWidget*> parent,
-		rpl::producer<uint64> balanceValue,
-		bool rightAlign) {
-	const auto balance = Ui::CreateChild<Balance>(parent);
-	const auto balanceStar = balance->lifetime().make_state<QImage>(
-		GenerateStars(st::creditsBalanceStarHeight, 1));
-	const auto starSize = balanceStar->size() / style::DevicePixelRatio();
-	const auto label = balance->lifetime().make_state<Ui::Text::String>(
-		st::defaultTextStyle,
-		tr::lng_credits_summary_balance(tr::now));
-	const auto count = balance->lifetime().make_state<Ui::Text::String>(
-		st::semiboldTextStyle,
-		tr::lng_contacts_loading(tr::now));
-	const auto diffBetweenStarAndCount = count->style()->font->spacew;
-	const auto resize = [=] {
-		balance->resize(
-			std::max(
-				label->maxWidth(),
-				count->maxWidth()
-					+ starSize.width()
-					+ diffBetweenStarAndCount),
-			label->style()->font->height + starSize.height());
-	};
-	std::move(balanceValue) | rpl::start_with_next([=](uint64 value) {
-		count->setText(
-			st::semiboldTextStyle,
-			Lang::FormatCountToShort(value).string);
-		balance->setBalance(value);
-		resize();
-	}, balance->lifetime());
-	balance->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(balance);
-
-		p.setPen(st::boxTextFg);
-
-		label->draw(p, {
-			.position = QPoint(
-				rightAlign ? (balance->width() - label->maxWidth()) : 0,
-				0),
-			.availableWidth = balance->width(),
-		});
-		count->draw(p, {
-			.position = QPoint(
-				balance->width() - count->maxWidth(),
-				label->minHeight()
-					+ (starSize.height() - count->minHeight()) / 2),
-			.availableWidth = balance->width(),
-		});
-		p.drawImage(
-			balance->width()
-				- count->maxWidth()
-				- starSize.width()
-				- diffBetweenStarAndCount,
-			label->minHeight(),
-			*balanceStar);
-	}, balance->lifetime());
-	return balance;
-}
-
-void ReceiptCreditsBox(
-		not_null<Ui::GenericBox*> box,
-		not_null<Window::SessionController*> controller,
-		PeerData *premiumBot,
-		const Data::CreditsHistoryEntry &e) {
-	box->setStyle(st::giveawayGiftCodeBox);
-	box->setNoContentMargin(true);
-
-	const auto star = GenerateStars(st::creditsTopupButton.height, 1);
-
-	const auto content = box->verticalLayout();
-	Ui::AddSkip(content);
-	Ui::AddSkip(content);
-	Ui::AddSkip(content);
-
-	using Type = Data::CreditsHistoryEntry::PeerType;
-
-	const auto &stUser = st::boostReplaceUserpic;
-	const auto peer = (e.peerType == Type::PremiumBot)
-		? premiumBot
-		: e.bareId
-		? controller->session().data().peer(PeerId(e.bareId)).get()
-		: nullptr;
-	const auto photo = e.photoId
-		? controller->session().data().photo(e.photoId).get()
-		: nullptr;
-	if (photo) {
-		content->add(object_ptr<Ui::CenterWrap<>>(
-			content,
-			HistoryEntryPhoto(content, photo, stUser.photoSize)));
-	} else if (peer) {
-		content->add(object_ptr<Ui::CenterWrap<>>(
-			content,
-			object_ptr<Ui::UserpicButton>(content, peer, stUser)));
-	} else {
-		const auto widget = content->add(
-			object_ptr<Ui::CenterWrap<>>(
-				content,
-				object_ptr<Ui::RpWidget>(content)))->entity();
-		using Draw = Fn<void(Painter &, int, int, int, int)>;
-		const auto draw = widget->lifetime().make_state<Draw>(
-			Ui::GenerateCreditsPaintUserpicCallback(e));
-		widget->resize(Size(stUser.photoSize));
-		widget->paintRequest(
-		) | rpl::start_with_next([=] {
-			auto p = Painter(widget);
-			(*draw)(p, 0, 0, stUser.photoSize, stUser.photoSize);
-		}, widget->lifetime());
-	}
-
-	Ui::AddSkip(content);
-	Ui::AddSkip(content);
-
-
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		box,
-		object_ptr<Ui::FlatLabel>(
-			box,
-			rpl::single(
-				!e.title.isEmpty()
-				? e.title
-				: peer
-				? peer->name()
-				: Ui::GenerateEntryName(e).text),
-			st::creditsBoxAboutTitle)));
-
-	Ui::AddSkip(content);
-
-	{
-		constexpr auto kMinus = QChar(0x2212);
-		auto &lifetime = content->lifetime();
-		const auto text = lifetime.make_state<Ui::Text::String>(
-			st::semiboldTextStyle,
-			(!e.bareId ? QChar('+') : kMinus)
-				+ Lang::FormatCountDecimal(e.credits));
-
-		const auto amount = content->add(
-			object_ptr<Ui::FixedHeightWidget>(
-				content,
-				star.height() / style::DevicePixelRatio()));
-		const auto font = text->style()->font;
-		amount->paintRequest(
-		) | rpl::start_with_next([=] {
-			auto p = Painter(amount);
-			const auto starWidth = star.width()
-				/ style::DevicePixelRatio();
-			const auto fullWidth = text->maxWidth()
-				+ font->spacew * 2
-				+ starWidth;
-			p.setPen(!e.bareId
-				? st::boxTextFgGood
-				: st::menuIconAttentionColor);
-			const auto x = (amount->width() - fullWidth) / 2;
-			text->draw(p, Ui::Text::PaintContext{
-				.position = QPoint(
-					x,
-					(amount->height() - font->height) / 2),
-				.outerWidth = amount->width(),
-				.availableWidth = amount->width(),
-			});;
-			p.drawImage(
-				x + fullWidth - starWidth,
-				0,
-				star);
-		}, amount->lifetime());
-	}
-
-	if (!e.description.isEmpty()) {
-		Ui::AddSkip(content);
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				rpl::single(e.description),
-				st::defaultFlatLabel)));
-	}
-
-	Ui::AddSkip(content);
-	Ui::AddSkip(content);
-
-	AddCreditsHistoryEntryTable(
-		controller,
-		box->verticalLayout(),
-		e);
-
-	const auto button = box->addButton(tr::lng_box_ok(), [=] {
-		box->closeBox();
-	});
-	const auto buttonWidth = st::boxWidth
-		- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
-}
-
-object_ptr<Ui::RpWidget> HistoryEntryPhoto(
-		not_null<Ui::RpWidget*> parent,
-		not_null<PhotoData*> photo,
-		int photoSize) {
-	struct State {
-		std::shared_ptr<Data::PhotoMedia> view;
-		Image *image = nullptr;
-		rpl::lifetime downloadLifetime;
-	};
-	const auto state = parent->lifetime().make_state<State>();
-	auto owned = object_ptr<Ui::RpWidget>(parent);
-	const auto widget = owned.data();
-	state->view = photo->createMediaView();
-	photo->load(Data::PhotoSize::Thumbnail, {});
-
-	widget->resize(Size(photoSize));
-
-	rpl::single(rpl::empty_value()) | rpl::then(
-		photo->owner().session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
-		using Size = Data::PhotoSize;
-		if (const auto large = state->view->image(Size::Large)) {
-			state->image = large;
-		} else if (const auto small = state->view->image(Size::Small)) {
-			state->image = small;
-		} else if (const auto t = state->view->image(Size::Thumbnail)) {
-			state->image = t;
-		}
-		widget->update();
-		if (state->view->loaded()) {
-			state->downloadLifetime.destroy();
-		}
-	}, state->downloadLifetime);
-
-	widget->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(widget);
-		if (state->image) {
-			p.drawPixmap(0, 0, state->image->pix(widget->width(), {
-				.options = Images::Option::RoundCircle,
-			}));
-		}
-	}, widget->lifetime());
-
-	return owned;
-}
-
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_credits.h b/Telegram/SourceFiles/settings/settings_credits.h
index 32eba05db71d9..c0e32e1be5e6c 100644
--- a/Telegram/SourceFiles/settings/settings_credits.h
+++ b/Telegram/SourceFiles/settings/settings_credits.h
@@ -9,43 +9,9 @@ For license and copyright information please follow this link:
 
 #include "settings/settings_type.h"
 
-template <typename Object>
-class object_ptr;
-
-class PeerData;
-
-namespace Data {
-struct CreditsHistoryEntry;
-} // namespace Data
-
-namespace Window {
-class SessionController;
-} // namespace Window
-
-namespace Ui {
-class GenericBox;
-class RpWidget;
-} // namespace Ui
-
 namespace Settings {
 
 [[nodiscard]] Type CreditsId();
 
-[[nodiscard]] not_null<Ui::RpWidget*> AddBalanceWidget(
-	not_null<Ui::RpWidget*> parent,
-	rpl::producer<uint64> balanceValue,
-	bool rightAlign);
-
-void ReceiptCreditsBox(
-	not_null<Ui::GenericBox*> box,
-	not_null<Window::SessionController*> controller,
-	PeerData *premiumBot,
-	const Data::CreditsHistoryEntry &e);
-
-[[nodiscard]] object_ptr<Ui::RpWidget> HistoryEntryPhoto(
-	not_null<Ui::RpWidget*> parent,
-	not_null<PhotoData*> photo,
-	int photoSize);
-
 } // namespace Settings
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
new file mode 100644
index 0000000000000..6b8cc7ecb880e
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -0,0 +1,391 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/settings_credits_graphics.h"
+
+#include "api/api_credits.h"
+#include "boxes/gift_premium_box.h"
+#include "core/click_handler_types.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo_media.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/settings_common_session.h"
+#include "statistics/widgets/chart_header_widget.h"
+#include "ui/boxes/boost_box.h" // Ui::StartFireworks.
+#include "ui/controls/userpic_button.h"
+#include "ui/effects/credits_graphics.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/effects/premium_top_bar.h"
+#include "ui/image/image_prepare.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/padding_wrap.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"
+#include "styles/style_settings.h"
+
+#include <xxhash.h> // XXH64.
+
+#include <QtSvg/QSvgRenderer>
+
+namespace Settings {
+namespace {
+
+class Balance final
+	: public Ui::RpWidget
+	, public Ui::AbstractTooltipShower {
+public:
+	using Ui::RpWidget::RpWidget;
+
+	void setBalance(uint64 balance) {
+		_balance = balance;
+		_tooltip = Lang::FormatCountDecimal(balance);
+	}
+
+	void enterEventHook(QEnterEvent *e) override {
+		if (_balance >= 10'000) {
+			Ui::Tooltip::Show(1000, this);
+		}
+	}
+
+	void leaveEventHook(QEvent *e) override {
+		Ui::Tooltip::Hide();
+	}
+
+	QString tooltipText() const override {
+		return _tooltip;
+	}
+
+	QPoint tooltipPos() const override {
+		return QCursor::pos();
+	}
+
+	bool tooltipWindowActive() const override {
+		return Ui::AppInFocus() && Ui::InFocusChain(window());
+	}
+
+private:
+	QString _tooltip;
+	uint64 _balance = 0;
+
+};
+
+} // namespace
+
+QImage GenerateStars(int height, int count) {
+	constexpr auto kOutlineWidth = .6;
+	constexpr auto kStrokeWidth = 3;
+	constexpr auto kShift = 3;
+
+	auto colorized = qs(Ui::Premium::ColorizedSvg(
+		Ui::Premium::CreditsIconGradientStops()));
+	colorized.replace(
+		u"stroke=\"none\""_q,
+		u"stroke=\"%1\""_q.arg(st::creditsStroke->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(kStrokeWidth));
+
+	const auto starSize = Size(height - kOutlineWidth * 2);
+
+	auto frame = QImage(
+		QSize(
+			(height + kShift * (count - 1)) * style::DevicePixelRatio(),
+			height * style::DevicePixelRatio()),
+		QImage::Format_ARGB32_Premultiplied);
+	frame.setDevicePixelRatio(style::DevicePixelRatio());
+	frame.fill(Qt::transparent);
+	const auto drawSingle = [&](QPainter &q) {
+		const auto s = kOutlineWidth;
+		q.save();
+		q.translate(s, s);
+		q.setCompositionMode(QPainter::CompositionMode_Clear);
+		svg.render(&q, QRectF(QPointF(s, 0), starSize));
+		svg.render(&q, QRectF(QPointF(s, s), starSize));
+		svg.render(&q, QRectF(QPointF(0, s), starSize));
+		svg.render(&q, QRectF(QPointF(-s, s), starSize));
+		svg.render(&q, QRectF(QPointF(-s, 0), starSize));
+		svg.render(&q, QRectF(QPointF(-s, -s), starSize));
+		svg.render(&q, QRectF(QPointF(0, -s), starSize));
+		svg.render(&q, QRectF(QPointF(s, -s), starSize));
+		q.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		svg.render(&q, Rect(starSize));
+		q.restore();
+	};
+	{
+		auto q = QPainter(&frame);
+		q.translate(frame.width() / style::DevicePixelRatio() - height, 0);
+		for (auto i = count; i > 0; --i) {
+			drawSingle(q);
+			q.translate(-kShift, 0);
+		}
+	}
+	return frame;
+}
+
+not_null<Ui::RpWidget*> AddBalanceWidget(
+		not_null<Ui::RpWidget*> parent,
+		rpl::producer<uint64> balanceValue,
+		bool rightAlign) {
+	const auto balance = Ui::CreateChild<Balance>(parent);
+	const auto balanceStar = balance->lifetime().make_state<QImage>(
+		GenerateStars(st::creditsBalanceStarHeight, 1));
+	const auto starSize = balanceStar->size() / style::DevicePixelRatio();
+	const auto label = balance->lifetime().make_state<Ui::Text::String>(
+		st::defaultTextStyle,
+		tr::lng_credits_summary_balance(tr::now));
+	const auto count = balance->lifetime().make_state<Ui::Text::String>(
+		st::semiboldTextStyle,
+		tr::lng_contacts_loading(tr::now));
+	const auto diffBetweenStarAndCount = count->style()->font->spacew;
+	const auto resize = [=] {
+		balance->resize(
+			std::max(
+				label->maxWidth(),
+				count->maxWidth()
+					+ starSize.width()
+					+ diffBetweenStarAndCount),
+			label->style()->font->height + starSize.height());
+	};
+	std::move(balanceValue) | rpl::start_with_next([=](uint64 value) {
+		count->setText(
+			st::semiboldTextStyle,
+			Lang::FormatCountToShort(value).string);
+		balance->setBalance(value);
+		resize();
+	}, balance->lifetime());
+	balance->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(balance);
+
+		p.setPen(st::boxTextFg);
+
+		label->draw(p, {
+			.position = QPoint(
+				rightAlign ? (balance->width() - label->maxWidth()) : 0,
+				0),
+			.availableWidth = balance->width(),
+		});
+		count->draw(p, {
+			.position = QPoint(
+				balance->width() - count->maxWidth(),
+				label->minHeight()
+					+ (starSize.height() - count->minHeight()) / 2),
+			.availableWidth = balance->width(),
+		});
+		p.drawImage(
+			balance->width()
+				- count->maxWidth()
+				- starSize.width()
+				- diffBetweenStarAndCount,
+			label->minHeight(),
+			*balanceStar);
+	}, balance->lifetime());
+	return balance;
+}
+
+void ReceiptCreditsBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		PeerData *premiumBot,
+		const Data::CreditsHistoryEntry &e) {
+	box->setStyle(st::giveawayGiftCodeBox);
+	box->setNoContentMargin(true);
+
+	const auto star = GenerateStars(st::creditsTopupButton.height, 1);
+
+	const auto content = box->verticalLayout();
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	using Type = Data::CreditsHistoryEntry::PeerType;
+
+	const auto &stUser = st::boostReplaceUserpic;
+	const auto peer = (e.peerType == Type::PremiumBot)
+		? premiumBot
+		: e.bareId
+		? controller->session().data().peer(PeerId(e.bareId)).get()
+		: nullptr;
+	const auto photo = e.photoId
+		? controller->session().data().photo(e.photoId).get()
+		: nullptr;
+	if (photo) {
+		content->add(object_ptr<Ui::CenterWrap<>>(
+			content,
+			HistoryEntryPhoto(content, photo, stUser.photoSize)));
+	} else if (peer) {
+		content->add(object_ptr<Ui::CenterWrap<>>(
+			content,
+			object_ptr<Ui::UserpicButton>(content, peer, stUser)));
+	} else {
+		const auto widget = content->add(
+			object_ptr<Ui::CenterWrap<>>(
+				content,
+				object_ptr<Ui::RpWidget>(content)))->entity();
+		using Draw = Fn<void(Painter &, int, int, int, int)>;
+		const auto draw = widget->lifetime().make_state<Draw>(
+			Ui::GenerateCreditsPaintUserpicCallback(e));
+		widget->resize(Size(stUser.photoSize));
+		widget->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = Painter(widget);
+			(*draw)(p, 0, 0, stUser.photoSize, stUser.photoSize);
+		}, widget->lifetime());
+	}
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+
+	box->addRow(object_ptr<Ui::CenterWrap<>>(
+		box,
+		object_ptr<Ui::FlatLabel>(
+			box,
+			rpl::single(
+				!e.title.isEmpty()
+				? e.title
+				: peer
+				? peer->name()
+				: Ui::GenerateEntryName(e).text),
+			st::creditsBoxAboutTitle)));
+
+	Ui::AddSkip(content);
+
+	{
+		constexpr auto kMinus = QChar(0x2212);
+		auto &lifetime = content->lifetime();
+		const auto text = lifetime.make_state<Ui::Text::String>(
+			st::semiboldTextStyle,
+			(!e.bareId ? QChar('+') : kMinus)
+				+ Lang::FormatCountDecimal(e.credits));
+
+		const auto amount = content->add(
+			object_ptr<Ui::FixedHeightWidget>(
+				content,
+				star.height() / style::DevicePixelRatio()));
+		const auto font = text->style()->font;
+		amount->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = Painter(amount);
+			const auto starWidth = star.width()
+				/ style::DevicePixelRatio();
+			const auto fullWidth = text->maxWidth()
+				+ font->spacew * 2
+				+ starWidth;
+			p.setPen(!e.bareId
+				? st::boxTextFgGood
+				: st::menuIconAttentionColor);
+			const auto x = (amount->width() - fullWidth) / 2;
+			text->draw(p, Ui::Text::PaintContext{
+				.position = QPoint(
+					x,
+					(amount->height() - font->height) / 2),
+				.outerWidth = amount->width(),
+				.availableWidth = amount->width(),
+			});;
+			p.drawImage(
+				x + fullWidth - starWidth,
+				0,
+				star);
+		}, amount->lifetime());
+	}
+
+	if (!e.description.isEmpty()) {
+		Ui::AddSkip(content);
+		box->addRow(object_ptr<Ui::CenterWrap<>>(
+			box,
+			object_ptr<Ui::FlatLabel>(
+				box,
+				rpl::single(e.description),
+				st::defaultFlatLabel)));
+	}
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	AddCreditsHistoryEntryTable(
+		controller,
+		box->verticalLayout(),
+		e);
+
+	const auto button = box->addButton(tr::lng_box_ok(), [=] {
+		box->closeBox();
+	});
+	const auto buttonWidth = st::boxWidth
+		- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
+	button->widthValue() | rpl::filter([=] {
+		return (button->widthNoMargins() != buttonWidth);
+	}) | rpl::start_with_next([=] {
+		button->resizeToWidth(buttonWidth);
+	}, button->lifetime());
+}
+
+object_ptr<Ui::RpWidget> HistoryEntryPhoto(
+		not_null<Ui::RpWidget*> parent,
+		not_null<PhotoData*> photo,
+		int photoSize) {
+	struct State {
+		std::shared_ptr<Data::PhotoMedia> view;
+		Image *image = nullptr;
+		rpl::lifetime downloadLifetime;
+	};
+	const auto state = parent->lifetime().make_state<State>();
+	auto owned = object_ptr<Ui::RpWidget>(parent);
+	const auto widget = owned.data();
+	state->view = photo->createMediaView();
+	photo->load(Data::PhotoSize::Thumbnail, {});
+
+	widget->resize(Size(photoSize));
+
+	rpl::single(rpl::empty_value()) | rpl::then(
+		photo->owner().session().downloaderTaskFinished()
+	) | rpl::start_with_next([=] {
+		using Size = Data::PhotoSize;
+		if (const auto large = state->view->image(Size::Large)) {
+			state->image = large;
+		} else if (const auto small = state->view->image(Size::Small)) {
+			state->image = small;
+		} else if (const auto t = state->view->image(Size::Thumbnail)) {
+			state->image = t;
+		}
+		widget->update();
+		if (state->view->loaded()) {
+			state->downloadLifetime.destroy();
+		}
+	}, state->downloadLifetime);
+
+	widget->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(widget);
+		if (state->image) {
+			p.drawPixmap(0, 0, state->image->pix(widget->width(), {
+				.options = Images::Option::RoundCircle,
+			}));
+		}
+	}, widget->lifetime());
+
+	return owned;
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
new file mode 100644
index 0000000000000..ec078f49242da
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -0,0 +1,49 @@
+/*
+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
+
+template <typename Object>
+class object_ptr;
+
+class PeerData;
+
+namespace Data {
+struct CreditsHistoryEntry;
+} // namespace Data
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+class GenericBox;
+class RpWidget;
+} // namespace Ui
+
+namespace Settings {
+
+[[nodiscard]] QImage GenerateStars(int height, int count);
+
+[[nodiscard]] not_null<Ui::RpWidget*> AddBalanceWidget(
+	not_null<Ui::RpWidget*> parent,
+	rpl::producer<uint64> balanceValue,
+	bool rightAlign);
+
+void ReceiptCreditsBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionController*> controller,
+	PeerData *premiumBot,
+	const Data::CreditsHistoryEntry &e);
+
+[[nodiscard]] object_ptr<Ui::RpWidget> HistoryEntryPhoto(
+	not_null<Ui::RpWidget*> parent,
+	not_null<PhotoData*> photo,
+	int photoSize);
+
+} // namespace Settings
+

From 0549c8f0374ed8f4c617f757ecc14f532b587849 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 24 May 2024 23:19:51 +0300
Subject: [PATCH 263/400] Moved out list of top-up options to single place.

---
 .../SourceFiles/settings/settings_credits.cpp | 146 +----------------
 .../settings/settings_credits_graphics.cpp    | 148 ++++++++++++++++++
 .../settings/settings_credits_graphics.h      |   6 +
 3 files changed, 160 insertions(+), 140 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index e2c4bcdf98214..adffaba25fee7 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -19,8 +19,6 @@ For license and copyright information please follow this link:
 #include "info/statistics/info_statistics_list_controllers.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "payments/payments_checkout_process.h"
-#include "payments/payments_form.h"
 #include "settings/settings_common_session.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/boost_box.h" // Ui::StartFireworks.
@@ -29,12 +27,10 @@ For license and copyright information please follow this link:
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
-#include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/discrete_sliders.h"
-#include "ui/widgets/labels.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
@@ -46,23 +42,9 @@ For license and copyright information please follow this link:
 #include "styles/style_settings.h"
 #include "styles/style_statistics.h"
 
-#include <xxhash.h> // XXH64.
-
-#include <QtSvg/QSvgRenderer>
-
 namespace Settings {
 namespace {
 
-[[nodiscard]] uint64 UniqueIdFromOption(
-		const Data::CreditTopupOption &d) {
-	const auto string = QString::number(d.credits)
-		+ d.product
-		+ d.currency
-		+ QString::number(d.amount);
-
-	return XXH64(string.data(), string.size() * sizeof(ushort), 0);
-}
-
 class Credits : public Section<Credits> {
 public:
 	Credits(
@@ -139,127 +121,6 @@ void Credits::setStepDataReference(std::any &data) {
 	}
 }
 
-void Credits::setupOptions(not_null<Ui::VerticalLayout*> container) {
-	const auto options = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto content = options->entity();
-
-	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
-
-	const auto fill = [=](Data::CreditTopupOptions options) {
-		while (content->count()) {
-			delete content->widgetAt(0);
-		}
-		Ui::AddSubsectionTitle(
-			content,
-			tr::lng_credits_summary_options_subtitle());
-		const auto &st = st::creditsTopupButton;
-		const auto diffBetweenTextAndStar = st.padding.left()
-			- st.iconLeft
-			- (_star.width() / style::DevicePixelRatio());
-		const auto buttonHeight = st.height + rect::m::sum::v(st.padding);
-		for (auto i = 0; i < options.size(); i++) {
-			const auto &option = options[i];
-			const auto button = content->add(object_ptr<Ui::SettingsButton>(
-				content,
-				rpl::never<QString>(),
-				st));
-			const auto text = button->lifetime().make_state<Ui::Text::String>(
-				st.style,
-				tr::lng_credits_summary_options_credits(
-					tr::now,
-					lt_count_decimal,
-					option.credits));
-			const auto price = Ui::CreateChild<Ui::FlatLabel>(
-				button,
-				Ui::FillAmountAndCurrency(option.amount, option.currency),
-				st::creditsTopupPrice);
-			const auto inner = Ui::CreateChild<Ui::RpWidget>(button);
-			const auto stars = GenerateStars(st.height, (i + 1));
-			inner->paintRequest(
-			) | rpl::start_with_next([=](const QRect &rect) {
-				auto p = QPainter(inner);
-				p.drawImage(
-					0,
-					(buttonHeight - stars.height()) / 2,
-					stars);
-				const auto textLeft = diffBetweenTextAndStar
-					+ stars.width() / style::DevicePixelRatio();
-				p.setPen(st.textFg);
-				text->draw(p, {
-					.position = QPoint(textLeft, 0),
-					.availableWidth = inner->width() - textLeft,
-				});
-			}, inner->lifetime());
-			button->sizeValue(
-			) | rpl::start_with_next([=](const QSize &size) {
-				price->moveToRight(st.padding.right(), st.padding.top());
-				inner->moveToLeft(st.iconLeft, st.padding.top());
-				inner->resize(
-					size.width()
-						- rect::m::sum::h(st.padding)
-						- price->width(),
-					buttonHeight);
-			}, button->lifetime());
-			button->setClickedCallback([=] {
-				const auto invoice = Payments::InvoiceCredits{
-					.session = &_controller->session(),
-					.randomId = UniqueIdFromOption(option),
-					.credits = option.credits,
-					.product = option.product,
-					.currency = option.currency,
-					.amount = option.amount,
-					.extended = option.extended,
-				};
-
-				const auto weak = Ui::MakeWeak(button);
-				const auto done = [=](Payments::CheckoutResult result) {
-					if (const auto strong = weak.data()) {
-						strong->window()->setFocus();
-						if (result == Payments::CheckoutResult::Paid) {
-							if (_parent) {
-								Ui::StartFireworks(_parent);
-							}
-						}
-					}
-				};
-
-				Payments::CheckoutProcess::Start(std::move(invoice), done);
-			});
-			Ui::ToggleChildrenVisibility(button, true);
-		}
-
-		// Footer.
-		{
-			auto text = tr::lng_credits_summary_options_about(
-				lt_link,
-				tr::lng_credits_summary_options_about_link(
-				) | rpl::map([](const QString &t) {
-					using namespace Ui::Text;
-					return Link(t, u"https://telegram.org/tos"_q);
-				}),
-				Ui::Text::RichLangValue);
-			Ui::AddSkip(content);
-			Ui::AddDividerText(content, std::move(text));
-		}
-
-		content->resizeToWidth(container->width());
-	};
-
-	using ApiOptions = Api::CreditsTopupOptions;
-	const auto apiCredits = content->lifetime().make_state<ApiOptions>(
-		_controller->session().user());
-
-	apiCredits->request(
-	) | rpl::start_with_error_done([=](const QString &error) {
-		_controller->showToast(error);
-	}, [=] {
-		fill(apiCredits->options());
-	}, content->lifetime());
-}
-
 void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 	const auto history = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -432,7 +293,12 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 
 void Credits::setupContent() {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-	setupOptions(content);
+	const auto paid = [=] {
+		if (_parent) {
+			Ui::StartFireworks(_parent);
+		}
+	};
+	FillCreditOptions(_controller, content, paid);
 	setupHistory(content);
 
 	Ui::ResizeFitChild(this, content);
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 6b8cc7ecb880e..bb768817718c9 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -15,9 +15,13 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
+#include "info/statistics/info_statistics_list_controllers.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "payments/payments_checkout_process.h"
+#include "payments/payments_form.h"
 #include "settings/settings_common_session.h"
+#include "settings/settings_credits_graphics.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/boost_box.h" // Ui::StartFireworks.
 #include "ui/controls/userpic_button.h"
@@ -28,12 +32,17 @@ For license and copyright information please follow this link:
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
 #include "window/window_session_controller.h"
 #include "styles/style_credits.h"
 #include "styles/style_giveaway.h"
@@ -41,6 +50,7 @@ For license and copyright information please follow this link:
 #include "styles/style_layers.h"
 #include "styles/style_premium.h"
 #include "styles/style_settings.h"
+#include "styles/style_statistics.h"
 
 #include <xxhash.h> // XXH64.
 
@@ -49,6 +59,16 @@ For license and copyright information please follow this link:
 namespace Settings {
 namespace {
 
+[[nodiscard]] uint64 UniqueIdFromOption(
+		const Data::CreditTopupOption &d) {
+	const auto string = QString::number(d.credits)
+		+ d.product
+		+ d.currency
+		+ QString::number(d.amount);
+
+	return XXH64(string.data(), string.size() * sizeof(ushort), 0);
+}
+
 class Balance final
 	: public Ui::RpWidget
 	, public Ui::AbstractTooltipShower {
@@ -143,6 +163,134 @@ QImage GenerateStars(int height, int count) {
 	return frame;
 }
 
+void FillCreditOptions(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		Fn<void()> paid) {
+	const auto options = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto content = options->entity();
+
+	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
+
+	const auto singleStarWidth = GenerateStars(
+		st::creditsTopupButton.height,
+		1).width() / style::DevicePixelRatio();
+
+	const auto fill = [=](Data::CreditTopupOptions options) {
+		while (content->count()) {
+			delete content->widgetAt(0);
+		}
+		Ui::AddSubsectionTitle(
+			content,
+			tr::lng_credits_summary_options_subtitle());
+		const auto &st = st::creditsTopupButton;
+		const auto diffBetweenTextAndStar = st.padding.left()
+			- st.iconLeft
+			- singleStarWidth;
+		const auto buttonHeight = st.height + rect::m::sum::v(st.padding);
+		for (auto i = 0; i < options.size(); i++) {
+			const auto &option = options[i];
+			const auto button = content->add(object_ptr<Ui::SettingsButton>(
+				content,
+				rpl::never<QString>(),
+				st));
+			const auto text = button->lifetime().make_state<Ui::Text::String>(
+				st.style,
+				tr::lng_credits_summary_options_credits(
+					tr::now,
+					lt_count_decimal,
+					option.credits));
+			const auto price = Ui::CreateChild<Ui::FlatLabel>(
+				button,
+				Ui::FillAmountAndCurrency(option.amount, option.currency),
+				st::creditsTopupPrice);
+			const auto inner = Ui::CreateChild<Ui::RpWidget>(button);
+			const auto stars = GenerateStars(st.height, (i + 1));
+			inner->paintRequest(
+			) | rpl::start_with_next([=](const QRect &rect) {
+				auto p = QPainter(inner);
+				p.drawImage(
+					0,
+					(buttonHeight - stars.height()) / 2,
+					stars);
+				const auto textLeft = diffBetweenTextAndStar
+					+ stars.width() / style::DevicePixelRatio();
+				p.setPen(st.textFg);
+				text->draw(p, {
+					.position = QPoint(textLeft, 0),
+					.availableWidth = inner->width() - textLeft,
+				});
+			}, inner->lifetime());
+			button->sizeValue(
+			) | rpl::start_with_next([=](const QSize &size) {
+				price->moveToRight(st.padding.right(), st.padding.top());
+				inner->moveToLeft(st.iconLeft, st.padding.top());
+				inner->resize(
+					size.width()
+						- rect::m::sum::h(st.padding)
+						- price->width(),
+					buttonHeight);
+			}, button->lifetime());
+			button->setClickedCallback([=] {
+				const auto invoice = Payments::InvoiceCredits{
+					.session = &controller->session(),
+					.randomId = UniqueIdFromOption(option),
+					.credits = option.credits,
+					.product = option.product,
+					.currency = option.currency,
+					.amount = option.amount,
+					.extended = option.extended,
+				};
+
+				const auto weak = Ui::MakeWeak(button);
+				const auto done = [=](Payments::CheckoutResult result) {
+					if (const auto strong = weak.data()) {
+						strong->window()->setFocus();
+						if (result == Payments::CheckoutResult::Paid) {
+							if (paid) {
+								paid();
+							}
+						}
+					}
+				};
+
+				Payments::CheckoutProcess::Start(std::move(invoice), done);
+			});
+			Ui::ToggleChildrenVisibility(button, true);
+		}
+
+		// Footer.
+		{
+			auto text = tr::lng_credits_summary_options_about(
+				lt_link,
+				tr::lng_credits_summary_options_about_link(
+				) | rpl::map([](const QString &t) {
+					using namespace Ui::Text;
+					return Link(t, u"https://telegram.org/tos"_q);
+				}),
+				Ui::Text::RichLangValue);
+			Ui::AddSkip(content);
+			Ui::AddDividerText(content, std::move(text));
+		}
+
+		content->resizeToWidth(container->width());
+	};
+
+	using ApiOptions = Api::CreditsTopupOptions;
+	const auto apiCredits = content->lifetime().make_state<ApiOptions>(
+		controller->session().user());
+
+	apiCredits->request(
+	) | rpl::start_with_error_done([=](const QString &error) {
+		controller->showToast(error);
+	}, [=] {
+		fill(apiCredits->options());
+	}, content->lifetime());
+}
+
 not_null<Ui::RpWidget*> AddBalanceWidget(
 		not_null<Ui::RpWidget*> parent,
 		rpl::producer<uint64> balanceValue,
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index ec078f49242da..3c09ff50f007c 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -23,12 +23,18 @@ class SessionController;
 namespace Ui {
 class GenericBox;
 class RpWidget;
+class VerticalLayout;
 } // namespace Ui
 
 namespace Settings {
 
 [[nodiscard]] QImage GenerateStars(int height, int count);
 
+void FillCreditOptions(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	Fn<void()> paid);
+
 [[nodiscard]] not_null<Ui::RpWidget*> AddBalanceWidget(
 	not_null<Ui::RpWidget*> parent,
 	rpl::producer<uint64> balanceValue,

From 5defb9fb17816736ba9c7c66d55e4e0fde60f587 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 25 May 2024 01:36:25 +0300
Subject: [PATCH 264/400] Fixed display of credit spending.

---
 .../info/statistics/info_statistics_list_controllers.cpp        | 2 +-
 Telegram/SourceFiles/settings/settings_credits_graphics.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index ecbcff3ec9dc9..0cdbe62334b72 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -769,7 +769,7 @@ void CreditsRow::init() {
 		_rightText.setText(
 			st::semiboldTextStyle,
 			(!_entry.bareId ? QChar('+') : kMinus)
-				+ Lang::FormatCountDecimal(_entry.credits));
+				+ Lang::FormatCountDecimal(std::abs(int64(_entry.credits))));
 	}
 	_paintUserpicCallback = !PeerListRow::special()
 		? PeerListRow::generatePaintUserpicCallback(false)
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index bb768817718c9..2511079c6044d 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -426,7 +426,7 @@ void ReceiptCreditsBox(
 		const auto text = lifetime.make_state<Ui::Text::String>(
 			st::semiboldTextStyle,
 			(!e.bareId ? QChar('+') : kMinus)
-				+ Lang::FormatCountDecimal(e.credits));
+				+ Lang::FormatCountDecimal(std::abs(int64(e.credits))));
 
 		const auto amount = content->add(
 			object_ptr<Ui::FixedHeightWidget>(

From 7d75c2521457ae322970a59058b1dd5a11077c96 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 25 May 2024 01:12:56 +0300
Subject: [PATCH 265/400] Added box for small balance of credits.

---
 Telegram/Resources/langs/lang.strings         |  3 +
 .../info_statistics_list_controllers.cpp      |  2 +-
 .../payments/payments_checkout_process.cpp    |  2 +
 .../payments/payments_non_panel_process.cpp   | 32 +++++++-
 .../SourceFiles/settings/settings_credits.cpp |  2 +-
 .../settings/settings_credits_graphics.cpp    | 82 +++++++++++++++++++
 .../settings/settings_credits_graphics.h      |  8 ++
 Telegram/SourceFiles/ui/effects/credits.style |  5 ++
 8 files changed, 133 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index efb548724efe5..9bae741a03e51 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2324,6 +2324,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_box_history_entry_id_copied" = "Transaction ID copied to clipboard.";
 "lng_credits_box_history_entry_about" = "You can dispute this transaction {link}.";
 "lng_credits_box_history_entry_about_link" = "here";
+"lng_credits_small_balance_title#one" = "{count} Star Needed";
+"lng_credits_small_balance_title#other" = "{count} Stars Needed";
+"lng_credits_small_balance_about" = "Buy **Stars** and use them on **{bot}** and other miniapps.";
 
 "lng_location_title" = "Location";
 "lng_location_about" = "Display the location of your business on your account.";
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 0cdbe62334b72..b608b72184d30 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -868,7 +868,7 @@ CreditsController::CreditsController(CreditsDescriptor d)
 , _premiumBot(d.premiumBot)
 , _entryClickedCallback(std::move(d.entryClickedCallback))
 , _creditIcon(d.creditIcon)
-, _api(d.premiumBot, d.in, d.out)
+, _api(d.premiumBot->session().user(), d.in, d.out)
 , _firstSlice(std::move(d.firstSlice)) {
 	PeerListController::setStyleOverrides(&st::boostsListBox);
 }
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index 3080c149bfc68..cbb435389b6cf 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -414,11 +414,13 @@ void CheckoutProcess::handleFormUpdate(const FormUpdate &update) {
 		if (_nonPanelPaymentFormProcess) {
 			_nonPanelPaymentFormProcess(
 				std::make_shared<CreditsFormData>(data.data));
+			close();
 		}
 	}, [&](const CreditsReceiptReady &data) {
 		if (_nonPanelPaymentFormProcess) {
 			_nonPanelPaymentFormProcess(
 				std::make_shared<CreditsReceiptData>(data.data));
+			close();
 		}
 	}, [&](const Error &error) {
 		handleError(error);
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index f2874d62ec919..12fb6a13fafe5 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -7,12 +7,15 @@ For license and copyright information please follow this link:
 */
 #include "payments/payments_non_panel_process.h"
 
+#include "api/api_credits.h"
 #include "base/unixtime.h"
 #include "boxes/send_credits_box.h"
 #include "data/data_credits.h"
 #include "data/data_photo.h"
+#include "data/data_user.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h"
+#include "main/main_session.h"
 #include "payments/payments_checkout_process.h" // NonPanelPaymentForm.
 #include "payments/payments_form.h"
 #include "settings/settings_credits_graphics.h"
@@ -40,7 +43,34 @@ Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
 		using CreditsFormDataPtr = std::shared_ptr<CreditsFormData>;
 		using CreditsReceiptPtr = std::shared_ptr<CreditsReceiptData>;
 		if (const auto creditsData = std::get_if<CreditsFormDataPtr>(&form)) {
-			controller->uiShow()->show(Box(Ui::SendCreditsBox, *creditsData));
+			const auto form = *creditsData;
+			const auto lifetime = std::make_shared<rpl::lifetime>();
+			const auto api = lifetime->make_state<Api::CreditsStatus>(
+				controller->session().user());
+			const auto sendBox = [=, weak = base::make_weak(controller)] {
+				if (const auto strong = weak.get()) {
+					controller->uiShow()->show(Box(Ui::SendCreditsBox, form));
+				}
+			};
+			const auto weak = base::make_weak(controller);
+			api->request({}, [=](Data::CreditsStatusSlice slice) {
+				if (const auto strong = weak.get()) {
+					strong->session().setCredits(slice.balance);
+					const auto creditsNeeded = int64(form->invoice.credits)
+						- int64(slice.balance);
+					if (creditsNeeded <= 0) {
+						sendBox();
+					} else {
+						strong->uiShow()->show(Box(
+							Settings::SmallBalanceBox,
+							strong,
+							creditsNeeded,
+							form->botId,
+							sendBox));
+					}
+				}
+				lifetime->destroy();
+			});
 		}
 		if (const auto r = std::get_if<CreditsReceiptPtr>(&form)) {
 			const auto receipt = *r;
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index adffaba25fee7..48a3eb9baa108 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -298,7 +298,7 @@ void Credits::setupContent() {
 			Ui::StartFireworks(_parent);
 		}
 	};
-	FillCreditOptions(_controller, content, paid);
+	FillCreditOptions(_controller, content, 0, paid);
 	setupHistory(content);
 
 	Ui::ResizeFitChild(this, content);
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 2511079c6044d..cab21f9eac779 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -166,6 +166,7 @@ QImage GenerateStars(int height, int count) {
 void FillCreditOptions(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container,
+		int minCredits,
 		Fn<void()> paid) {
 	const auto options = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -193,6 +194,9 @@ void FillCreditOptions(
 		const auto buttonHeight = st.height + rect::m::sum::v(st.padding);
 		for (auto i = 0; i < options.size(); i++) {
 			const auto &option = options[i];
+			if (option.credits < minCredits) {
+				continue;
+			}
 			const auto button = content->add(object_ptr<Ui::SettingsButton>(
 				content,
 				rpl::never<QString>(),
@@ -536,4 +540,82 @@ object_ptr<Ui::RpWidget> HistoryEntryPhoto(
 	return owned;
 }
 
+void SmallBalanceBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		int creditsNeeded,
+		UserId botId,
+		Fn<void()> paid) {
+	box->setWidth(st::boxWideWidth);
+	box->addButton(tr::lng_close(), [=] { box->closeBox(); });
+	const auto done = [=] {
+		box->closeBox();
+		paid();
+	};
+
+	const auto bot = controller->session().data().user(botId).get();
+
+	const auto content = [&]() -> Ui::Premium::TopBarAbstract* {
+		const auto weak = base::make_weak(controller);
+		const auto clickContextOther = [=] {
+			return QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = weak,
+				.botStartAutoSubmit = true,
+			});
+		};
+		return box->setPinnedToTopContent(object_ptr<Ui::Premium::TopBar>(
+			box,
+			st::creditsLowBalancePremiumCover,
+			Ui::Premium::TopBarDescriptor{
+				.clickContextOther = clickContextOther,
+				.title = tr::lng_credits_small_balance_title(
+					lt_count,
+					rpl::single(creditsNeeded) | tr::to_count()),
+				.about = tr::lng_credits_small_balance_about(
+					lt_bot,
+					rpl::single(TextWithEntities{ bot->name() }),
+					Ui::Text::RichLangValue),
+				.light = true,
+				.gradientStops = Ui::Premium::CreditsIconGradientStops(),
+			}));
+	}();
+
+	FillCreditOptions(controller, box->verticalLayout(), creditsNeeded, done);
+
+	content->setMaximumHeight(st::creditsLowBalancePremiumCoverHeight);
+	content->setMinimumHeight(st::infoLayerTopBarHeight);
+
+	content->resize(content->width(), content->maximumHeight());
+	content->additionalHeight(
+	) | rpl::start_with_next([=](int additionalHeight) {
+		const auto wasMax = (content->height() == content->maximumHeight());
+		content->setMaximumHeight(st::creditsLowBalancePremiumCoverHeight
+			+ additionalHeight);
+		if (wasMax) {
+			content->resize(content->width(), content->maximumHeight());
+		}
+	}, content->lifetime());
+
+	{
+		const auto balance = AddBalanceWidget(
+			content,
+			controller->session().creditsValue(),
+			true);
+		const auto api = balance->lifetime().make_state<Api::CreditsStatus>(
+			controller->session().user());
+		api->request({}, [=](Data::CreditsStatusSlice slice) {
+			controller->session().setCredits(slice.balance);
+		});
+		rpl::combine(
+			balance->sizeValue(),
+			content->sizeValue()
+		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+			balance->moveToRight(
+				st::creditsHistoryRightSkip * 2,
+				st::creditsHistoryRightSkip);
+			balance->update();
+		}, balance->lifetime());
+	}
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index 3c09ff50f007c..cb6c27e7eadf7 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -33,6 +33,7 @@ namespace Settings {
 void FillCreditOptions(
 	not_null<Window::SessionController*> controller,
 	not_null<Ui::VerticalLayout*> container,
+	int minCredits,
 	Fn<void()> paid);
 
 [[nodiscard]] not_null<Ui::RpWidget*> AddBalanceWidget(
@@ -51,5 +52,12 @@ void ReceiptCreditsBox(
 	not_null<PhotoData*> photo,
 	int photoSize);
 
+void SmallBalanceBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionController*> controller,
+	int creditsNeeded,
+	UserId botId,
+	Fn<void()> paid);
+
 } // namespace Settings
 
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 9f6866f964ef5..bc05f58f8c5d7 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -16,6 +16,11 @@ creditsPremiumCover: PremiumCover(defaultPremiumCover) {
 		textFg: boxTitleFg;
 	}
 }
+creditsLowBalancePremiumCover: PremiumCover(creditsPremiumCover) {
+	starSize: size(64px, 62px);
+	starTopSkip: 30px;
+}
+creditsLowBalancePremiumCoverHeight: 180px;
 creditsTopupButton: SettingsButton(settingsButton) {
 	style: semiboldTextStyle;
 }

From 0bd780b20f1ca6d2008859cd36e2b184d7aafcc8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 25 May 2024 01:36:17 +0300
Subject: [PATCH 266/400] Added fireworks effect on success credit sending.

---
 Telegram/SourceFiles/boxes/send_credits_box.cpp          | 4 +++-
 Telegram/SourceFiles/boxes/send_credits_box.h            | 3 ++-
 .../SourceFiles/payments/payments_non_panel_process.cpp  | 9 ++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 303560ab3ae08..309f4833ce126 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -43,7 +43,8 @@ namespace Ui {
 
 void SendCreditsBox(
 		not_null<Ui::GenericBox*> box,
-		std::shared_ptr<Payments::CreditsFormData> form) {
+		std::shared_ptr<Payments::CreditsFormData> form,
+		Fn<void()> sent) {
 	if (!form) {
 		return;
 	}
@@ -145,6 +146,7 @@ void SendCreditsBox(
 		).done([=](auto result) {
 			state->confirmButtonBusy = false;
 			box->closeBox();
+			sent();
 		}).fail([=](const MTP::Error &error) {
 			state->confirmButtonBusy = false;
 			box->uiShow()->showToast(error.type());
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.h b/Telegram/SourceFiles/boxes/send_credits_box.h
index bbc74107a682c..25ceb1d562db9 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.h
+++ b/Telegram/SourceFiles/boxes/send_credits_box.h
@@ -19,6 +19,7 @@ class GenericBox;
 
 void SendCreditsBox(
 	not_null<Ui::GenericBox*> box,
-	std::shared_ptr<Payments::CreditsFormData> data);
+	std::shared_ptr<Payments::CreditsFormData> data,
+	Fn<void()> sent);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index 12fb6a13fafe5..62a3b4681ba84 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -16,9 +16,11 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "history/history_item_components.h"
 #include "main/main_session.h"
+#include "mainwidget.h"
 #include "payments/payments_checkout_process.h" // NonPanelPaymentForm.
 #include "payments/payments_form.h"
 #include "settings/settings_credits_graphics.h"
+#include "ui/boxes/boost_box.h" // Ui::StartFireworks.
 #include "ui/layers/generic_box.h"
 #include "ui/text/format_values.h"
 #include "window/window_session_controller.h"
@@ -49,7 +51,12 @@ Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
 				controller->session().user());
 			const auto sendBox = [=, weak = base::make_weak(controller)] {
 				if (const auto strong = weak.get()) {
-					controller->uiShow()->show(Box(Ui::SendCreditsBox, form));
+					controller->uiShow()->show(Box(
+						Ui::SendCreditsBox,
+						form,
+						crl::guard(strong, [=] {
+							Ui::StartFireworks(strong->content());
+						})));
 				}
 			};
 			const auto weak = base::make_weak(controller);

From c942034ca45e6d5c937adceaa00d738946b1df50 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 25 May 2024 03:11:58 +0300
Subject: [PATCH 267/400] Added link to terms to box of credits history
 entries.

---
 Telegram/Resources/langs/lang.strings          |  1 +
 .../settings/settings_credits_graphics.cpp     | 18 ++++++++++++++++++
 Telegram/SourceFiles/ui/effects/credits.style  |  4 ++++
 3 files changed, 23 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9bae741a03e51..54b5ee94a7089 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2316,6 +2316,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_box_out_sure#other" = "Do you want to buy **\"{text}\"** in **{bot}** for **{count} Stars**?";
 "lng_credits_box_out_confirm#one" = "Confirm and Pay {emoji} {count} Star";
 "lng_credits_box_out_confirm#other" = "Confirm and Pay {emoji} {count} Stars";
+"lng_credits_box_out_about" = "Review the {link} for Stars.";
 "lng_credits_summary_in_toast_title" = "Stars Acquired";
 "lng_credits_summary_in_toast_about#one" = "**{count}** Star added to your balance.";
 "lng_credits_summary_in_toast_about#other" = "**{count}** Stars added to your balance.";
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index cab21f9eac779..47dec10b9ffda 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -481,6 +481,24 @@ void ReceiptCreditsBox(
 		box->verticalLayout(),
 		e);
 
+	Ui::AddSkip(content);
+
+	box->addRow(object_ptr<Ui::CenterWrap<>>(
+		box,
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_credits_box_out_about(
+				lt_link,
+				tr::lng_payments_terms_link(
+				) | rpl::map([](const QString &t) {
+					using namespace Ui::Text;
+					return Link(t, u"https://telegram.org/tos"_q);
+				}),
+				Ui::Text::WithEntities),
+			st::creditsBoxAboutDivider)));
+
+	Ui::AddSkip(content);
+
 	const auto button = box->addButton(tr::lng_box_ok(), [=] {
 		box->closeBox();
 	});
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index bc05f58f8c5d7..2da64404d5353 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -39,3 +39,7 @@ creditsBoxAbout: FlatLabel(defaultFlatLabel) {
 creditsBoxAboutTitle: FlatLabel(settingsPremiumUserTitle) {
 	minWidth: 256px;
 }
+
+creditsBoxAboutDivider: FlatLabel(boxDividerLabel) {
+	align: align(top);
+}

From a0d97f03cb795ff3d51733164743da07834ec0ce Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 25 May 2024 11:31:00 +0400
Subject: [PATCH 268/400] Add factcheck footer support.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../view/media/history_view_web_page.cpp      | 75 ++++++++++++++++---
 .../view/media/history_view_web_page.h        |  6 +-
 Telegram/SourceFiles/ui/chat/chat.style       |  4 +
 4 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 54b5ee94a7089..eb8eecb58c04a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3301,6 +3301,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_factcheck_add_done" = "Fact check added.";
 "lng_factcheck_edit_done" = "Fact check edited.";
 "lng_factcheck_remove_done" = "Fact check removed.";
+"lng_factcheck_bottom" = "This clarification was provided by a fact checking agency assigned by the department of the government of your country ({country}) responsible for combatting misinformation.";
 
 "lng_translate_show_original" = "Show Original";
 "lng_translate_bar_to" = "Translate to {name}";
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 9c4c1ef05e02e..0275ed2c26ac5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -153,6 +153,17 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 	});
 }
 
+[[nodiscard]] QString LookupFactcheckCountryIso2(
+		not_null<HistoryItem*> item) {
+	const auto info = item->Get<HistoryMessageFactcheck>();
+	return info ? info->data.country : QString();
+}
+
+[[nodiscard]] QString LookupFactcheckCountryName(const QString &iso2) {
+	const auto name = Countries::Instance().countryNameByISO2(iso2);
+	return name.isEmpty() ? iso2 : name;
+}
+
 [[nodiscard]] ClickHandlerPtr AboutFactcheckClickHandler(QString iso2) {
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
@@ -163,10 +174,11 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 			? controller->uiShow()
 			: nullptr;
 		if (show) {
-			const auto name = Countries::Instance().countryNameByISO2(iso2);
-			const auto use = name.isEmpty() ? iso2 : name;
+			const auto country = LookupFactcheckCountryName(iso2);
 			show->showToast({
-				.text = { tr::lng_factcheck_about(tr::now, lt_country, use) },
+				.text = {
+					tr::lng_factcheck_about(tr::now, lt_country, country)
+				},
 				.duration = kFactcheckAboutDuration,
 			});
 		}
@@ -179,7 +191,7 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		if (const auto strong = weak.get()) {
 			if (const auto factcheck = strong->Get<Factcheck>()) {
-				factcheck->expanded = !factcheck->expanded;
+				factcheck->expanded = factcheck->expanded ? 0 : 1;
 				strong->history()->owner().requestViewResize(strong);
 			}
 		}
@@ -310,6 +322,7 @@ void WebPage::setupAdditionalData() {
 		}
 	} else if (_data->type == WebPageType::Factcheck) {
 		_additionalData = std::make_unique<AdditionalData>(FactcheckData());
+		const auto raw = factcheckData();
 	}
 }
 
@@ -347,11 +360,23 @@ QSize WebPage::countOptimalSize() {
 		_dataVersion = _data->version;
 		_openl = nullptr;
 		_attach = nullptr;
-		_collage = PrepareCollageMedia(_parent->data(), _data->collage);
+		const auto item = _parent->data();
+		_collage = PrepareCollageMedia(item, _data->collage);
 		const auto min = st::msgMinWidth - rect::m::sum::h(_st.padding);
 		_siteName = Ui::Text::String(min);
 		_title = Ui::Text::String(min);
 		_description = Ui::Text::String(min);
+		if (factcheck) {
+			factcheck->footer = Ui::Text::String(
+				st::factcheckFooterStyle,
+				tr::lng_factcheck_bottom(
+					tr::now,
+					lt_country,
+					LookupFactcheckCountryName(
+						LookupFactcheckCountryIso2(item))),
+				kDefaultTextOptions,
+				min);
+		}
 	}
 	const auto lineHeight = UnitedLineHeight();
 
@@ -400,9 +425,9 @@ QSize WebPage::countOptimalSize() {
 			}
 		} else if (factcheck) {
 			const auto item = _parent->data();
-			if (const auto info = item->Get<HistoryMessageFactcheck>()) {
-				const auto country = info->data.country;
-				factcheck->hint.link = AboutFactcheckClickHandler(country);
+			const auto iso2 = LookupFactcheckCountryIso2(item);
+			if (!iso2.isEmpty()) {
+				factcheck->hint.link = AboutFactcheckClickHandler(iso2);
 			}
 		} else if (_data->document
 			&& (_data->document->isWallPaper()
@@ -535,6 +560,10 @@ QSize WebPage::countOptimalSize() {
 			_description.maxWidth() + articlePhotoMaxWidth);
 		minHeight += descriptionMinHeight;
 	}
+	if (factcheck && factcheck->expanded) {
+		accumulate_max(maxWidth, factcheck->footer.maxWidth());
+		minHeight += st::factcheckFooterSkip + factcheck->footer.minHeight();
+	}
 	if (_attach) {
 		const auto attachAtTop = _siteName.isEmpty()
 			&& _title.isEmpty()
@@ -597,8 +626,8 @@ QSize WebPage::countCurrentSize(int newWidth) {
 		? computeFactcheckMetrics(_description.countHeight(innerWidth))
 		: FactcheckMetrics();
 	if (factcheck) {
-		factcheck->expandable = factcheckMetrics.expandable;
-		factcheck->expanded = factcheckMetrics.expanded;
+		factcheck->expandable = factcheckMetrics.expandable ? 1 : 0;
+		factcheck->expanded = factcheckMetrics.expanded ? 1 : 0;
 		_openl = factcheck->expandable
 			? ToggleFactcheckClickHandler(_parent)
 			: nullptr;
@@ -682,6 +711,11 @@ QSize WebPage::countCurrentSize(int newWidth) {
 				newHeight += _descriptionLines * lineHeight;
 			}
 		}
+		if (factcheck && factcheck->expanded) {
+			factcheck->footerHeight = st::factcheckFooterSkip
+				+ factcheck->footer.countHeight(innerWidth);
+			newHeight += factcheck->footerHeight;
+		}
 
 		if (_attach) {
 			const auto attachAtTop = !_siteNameLines
@@ -1023,6 +1057,23 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			? (_descriptionLines * lineHeight)
 			: _description.countHeight(paintw);
 	}
+	if (factcheck && factcheck->expanded) {
+		const auto skip = st::factcheckFooterSkip;
+		const auto line = st::lineWidth;
+		const auto separatorTop = tshift + skip / 2;
+
+		auto color = cache->icon;
+		color.setAlphaF(color.alphaF() * 0.3);
+		p.fillRect(inner.left(), separatorTop, paintw, line, color);
+
+		p.setPen(cache->icon);
+		factcheck->footer.draw(p, {
+			.position = { inner.left(), tshift + skip },
+			.outerWidth = width(),
+			.availableWidth = paintw,
+		});
+		tshift += factcheck->footerHeight;
+	}
 	if (_attach) {
 		const auto attachAtTop = !_siteNameLines
 			&& !_titleLines
@@ -1492,7 +1543,9 @@ bool WebPage::isLogEntryOriginal() const {
 WebPage::FactcheckMetrics WebPage::computeFactcheckMetrics(
 		int fullHeight) const {
 	const auto possible = fullHeight / st::normalFont->height;
-	const auto expandable = (possible > kFactcheckCollapsedLines + 1);
+	//const auto expandable = (possible > kFactcheckCollapsedLines + 1);
+	// Now always expandable because of the footer.
+	const auto expandable = true;
 	const auto check = _parent->Get<Factcheck>();
 	const auto expanded = check && check->expanded;
 	const auto allowExpanding = (expanded || !expandable);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
index 4637adb31c11d..454af2bbf7fbe 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -129,8 +129,10 @@ class WebPage : public Media {
 	};
 	struct FactcheckData {
 		HintData hint;
-		bool expandable = false;
-		bool expanded = false;
+		Ui::Text::String footer;
+		uint32 footerHeight : 30 = 0;
+		uint32 expandable : 1 = 0;
+		uint32 expanded : 1 = 0;
 	};
 	using AdditionalData = std::variant<
 		StickerSetData,
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 9dbf4330389e4..3069b6f907e6e 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1133,6 +1133,10 @@ effectPreviewLoading: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
 	thickness: 2px;
 }
 
+factcheckFooterSkip: 16px;
+factcheckFooterStyle: TextStyle(defaultTextStyle) {
+	font: font(11px);
+}
 factcheckIconExpand: icon {{ "fast_to_original-rotate_cw", historyPeer1NameFg }};
 factcheckIconCollapse: icon {{ "fast_to_original-rotate_ccw", historyPeer1NameFg }};
 factcheckField: InputField(defaultInputField) {

From 885dcf0b284d84971281922c8a51cd145f0b3aac Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 27 May 2024 23:24:49 +0400
Subject: [PATCH 269/400] Update API scheme on layer 181.

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

diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index fb82b7ff9361d..f62e07bf66fdf 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1803,7 +1803,7 @@ starsTransactionPeer#d80da15d peer:Peer = StarsTransactionPeer;
 
 starsTopupOption#bd915c0 flags:# extended:flags.1?true stars:long store_product:flags.0?string currency:string amount:long = StarsTopupOption;
 
-starsTransaction#cc7079b2 flags:# id:string stars:long date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument = StarsTransaction;
+starsTransaction#cc7079b2 flags:# refund:flags.3?true id:string stars:long date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument = StarsTransaction;
 
 payments.starsStatus#8cf4ee60 flags:# balance:long history:Vector<StarsTransaction> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.StarsStatus;
 
@@ -2351,7 +2351,7 @@ payments.getStarsTopupOptions#c00ec7d3 = Vector<StarsTopupOption>;
 payments.getStarsStatus#104fcfa7 peer:InputPeer = payments.StarsStatus;
 payments.getStarsTransactions#673ac2f9 flags:# inbound:flags.0?true outbound:flags.1?true peer:InputPeer offset:string = payments.StarsStatus;
 payments.sendStarsForm#2bb731d flags:# form_id:long invoice:InputInvoice = payments.PaymentResult;
-payments.refundStarsCharge#f090bbec user_id:InputUser msg_id:int charge_id:string = Updates;
+payments.refundStarsCharge#25ae8f4a user_id:InputUser charge_id:string = Updates;
 
 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;

From be099880d8bbf928a266f4b2ea93de156c07cfe1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 02:22:32 +0300
Subject: [PATCH 270/400] Added initial ability to claim refund credits from
 history entries list.

---
 Telegram/SourceFiles/api/api_credits.cpp      | 25 +++++++++--
 Telegram/SourceFiles/api/api_credits.h        |  6 +++
 .../info_statistics_list_controllers.cpp      | 42 +++++++++++++++++--
 .../info_statistics_list_controllers.h        |  5 +++
 .../SourceFiles/settings/settings_credits.cpp |  3 ++
 5 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 453d9536f3bd4..84c3e646f6591 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -8,15 +8,14 @@ For license and copyright information please follow this link:
 #include "api/api_credits.h"
 
 #include "apiwrap.h"
+#include "api/api_updates.h"
 #include "base/unixtime.h"
 #include "data/data_peer.h"
 #include "data/data_photo.h"
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
-#if _DEBUG
-#include "base/random.h"
-#endif
 
 namespace Api {
 namespace {
@@ -199,4 +198,24 @@ rpl::producer<not_null<PeerData*>> PremiumPeerBot(
 	};
 }
 
+void CreditsRefund(
+		not_null<PeerData*> peer,
+		const QString &entryId,
+		Fn<void()> done,
+		Fn<void(QString)> fail) {
+	const auto user = peer->asUser();
+	if (!user) {
+		return;
+	}
+	peer->session().api().request(MTPpayments_RefundStarsCharge(
+		user->inputUser,
+		MTP_string(entryId)
+	)).done([=](const MTPUpdates &result) {
+		peer->session().api().updates().applyUpdates(result);
+		done();
+	}).fail([=](const MTP::Error &error) {
+		fail(error.type());
+	}).send();
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_credits.h b/Telegram/SourceFiles/api/api_credits.h
index 265e7b3871076..bd064a65b9b3c 100644
--- a/Telegram/SourceFiles/api/api_credits.h
+++ b/Telegram/SourceFiles/api/api_credits.h
@@ -68,6 +68,12 @@ class CreditsHistory final {
 
 };
 
+void CreditsRefund(
+	not_null<PeerData*> peer,
+	const QString &entryId,
+	Fn<void()> done,
+	Fn<void(QString)> fail);
+
 [[nodiscard]] rpl::producer<not_null<PeerData*>> PremiumPeerBot(
 	not_null<Main::Session*> session);
 
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index b608b72184d30..0028e0fabe644 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -19,6 +19,7 @@ For license and copyright information please follow this link:
 #include "info/channel_statistics/boosts/giveaway/boost_badge.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "main/session/session_show.h"
 #include "ui/effects/credits_graphics.h"
 #include "ui/effects/outline_segments.h" // Ui::UnreadStoryOutlineGradient.
 #include "ui/effects/toggle_arrow.h"
@@ -841,6 +842,10 @@ class CreditsController final : public PeerListController {
 	void rowClicked(not_null<PeerListRow*> row) override;
 	void loadMoreRows() override;
 
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+
 	[[nodiscard]] bool skipRequest() const;
 	void requestNext();
 
@@ -930,6 +935,29 @@ void CreditsController::rowClicked(not_null<PeerListRow*> row) {
 	}
 }
 
+base::unique_qptr<Ui::PopupMenu> CreditsController::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	const auto entry = static_cast<const CreditsRow*>(row.get())->entry();
+	if (!entry.bareId) {
+		return nullptr;
+	}
+	auto menu = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::defaultPopupMenu);
+	const auto peer = row->peer();
+	const auto callback = crl::guard(parent, [=, id = entry.id] {
+		const auto show = delegate()->peerListUiShow();
+		Api::CreditsRefund(
+			peer,
+			id,
+			[=] { show->showToast(tr::lng_report_spam_done(tr::now)); },
+			[=](const QString &error) { show->showToast(error); });
+	});
+	menu->addAction(tr::lng_channel_earn_history_return(tr::now), callback);
+	return menu;
+}
+
 rpl::producer<bool> CreditsController::allLoadedValue() const {
 	return _allLoaded.value();
 }
@@ -1086,6 +1114,7 @@ void AddBoostsList(
 }
 
 void AddCreditsHistoryList(
+		std::shared_ptr<Main::SessionShow> show,
 		const Data::CreditsStatusSlice &firstSlice,
 		not_null<Ui::VerticalLayout*> container,
 		Fn<void(const Data::CreditsHistoryEntry &)> callback,
@@ -1094,13 +1123,18 @@ void AddCreditsHistoryList(
 		bool in,
 		bool out) {
 	struct State final {
-		State(CreditsDescriptor d) : controller(std::move(d)) {
+		State(
+			CreditsDescriptor d,
+			std::shared_ptr<Main::SessionShow> show)
+		: delegate(std::move(show))
+		, controller(std::move(d)) {
 		}
-		PeerListContentDelegateSimple delegate;
+		PeerListContentDelegateShow delegate;
 		CreditsController controller;
 	};
-	auto d = CreditsDescriptor{ firstSlice, callback, bot, icon, in, out };
-	const auto state = container->lifetime().make_state<State>(std::move(d));
+	const auto state = container->lifetime().make_state<State>(
+		CreditsDescriptor{ firstSlice, callback, bot, icon, in, out },
+		show);
 
 	state->delegate.setContent(container->add(
 		object_ptr<PeerListContent>(container, &state->controller)));
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h
index 09883090d2f99..2d381cb7cd8e1 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.h
@@ -23,6 +23,10 @@ struct RecentPostId;
 struct SupergroupStatistics;
 } // namespace Data
 
+namespace Main {
+class SessionShow;
+} // namespace Main
+
 namespace Info::Statistics {
 
 void AddPublicForwards(
@@ -47,6 +51,7 @@ void AddBoostsList(
 	rpl::producer<QString> title);
 
 void AddCreditsHistoryList(
+	std::shared_ptr<Main::SessionShow> show,
 	const Data::CreditsStatusSlice &firstSlice,
 	not_null<Ui::VerticalLayout*> container,
 	Fn<void(const Data::CreditsHistoryEntry &)> entryClickedCallback,
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 48a3eb9baa108..4cfeff84380e3 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -239,6 +239,7 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 		};
 
 		Info::Statistics::AddCreditsHistoryList(
+			controller->uiShow(),
 			fullSlice,
 			fullWrap->entity(),
 			entryClicked,
@@ -247,6 +248,7 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 			true,
 			true);
 		Info::Statistics::AddCreditsHistoryList(
+			controller->uiShow(),
 			inSlice,
 			inWrap->entity(),
 			entryClicked,
@@ -255,6 +257,7 @@ void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
 			true,
 			false);
 		Info::Statistics::AddCreditsHistoryList(
+			controller->uiShow(),
 			outSlice,
 			outWrap->entity(),
 			std::move(entryClicked),

From ebaffc333e0a9758c09d823e57ec4f575ba79ce5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 02:28:13 +0300
Subject: [PATCH 271/400] Added initial api support of refund flag to credits
 history entries.

---
 Telegram/SourceFiles/api/api_credits.cpp               |  1 +
 Telegram/SourceFiles/data/data_credits.h               |  1 +
 .../SourceFiles/settings/settings_credits_graphics.cpp | 10 ++++++++++
 3 files changed, 12 insertions(+)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 84c3e646f6591..00f9e789f8a49 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -52,6 +52,7 @@ namespace {
 		}, [](const MTPDstarsTransactionPeerPremiumBot &) {
 			return Data::CreditsHistoryEntry::PeerType::PremiumBot;
 		}),
+		.refunded = tl.data().is_refund(),
 	};
 }
 
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index af830e26c8b8d..ddfd22a83ea61 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -37,6 +37,7 @@ struct CreditsHistoryEntry final {
 	uint64 credits = 0;
 	uint64 bareId = 0;
 	PeerType peerType;
+	bool refunded = false;
 };
 
 struct CreditsStatusSlice final {
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 47dec10b9ffda..0cd0ae1a2fe64 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -473,6 +473,16 @@ void ReceiptCreditsBox(
 				st::defaultFlatLabel)));
 	}
 
+	if (e.refunded) {
+		Ui::AddSkip(content);
+		box->addRow(object_ptr<Ui::CenterWrap<>>(
+			box,
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_channel_earn_history_return_about(),
+				st::defaultFlatLabel)));
+	}
+
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 

From 056ba644edc617c470cddee8b2a0c38cbac106a1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 13:58:31 +0400
Subject: [PATCH 272/400] Fix empty search placeholder.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index a56e28b2fbc4f..f90993a19edb4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -118,9 +118,16 @@ constexpr auto kChatPreviewDelay = crl::time(1000);
 	const auto query = state.query.trimmed();
 	const auto hashtag = !query.isEmpty() && (query[0] == '#');
 	const auto trimmed = hashtag ? query.mid(1).trimmed() : query;
+	const auto fromPeer = (state.tab == ChatSearchTab::MyMessages
+		|| state.tab == ChatSearchTab::PublicPosts
+		|| !state.inChat.peer()
+		|| !(state.inChat.peer()->isChat()
+			|| state.inChat.peer()->isMegagroup()))
+		? nullptr
+		: state.fromPeer;
 	const auto waiting = trimmed.isEmpty()
 		&& state.tags.empty()
-		&& !state.fromPeer;
+		&& !fromPeer;
 	const auto icon = waiting
 		? SearchEmptyIcon::Search
 		: SearchEmptyIcon::NoResults;

From c0f3d263a38b8a3650dec493d827aba09a40d157 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 May 2024 13:58:47 +0400
Subject: [PATCH 273/400] Remove webpage length limit for factcheck.

---
 Telegram/SourceFiles/ui/text/text_options.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/text/text_options.cpp b/Telegram/SourceFiles/ui/text/text_options.cpp
index 3c9eb97a65be5..404b53c8bfbc9 100644
--- a/Telegram/SourceFiles/ui/text/text_options.cpp
+++ b/Telegram/SourceFiles/ui/text/text_options.cpp
@@ -116,7 +116,6 @@ void InitTextOptions() {
 		- st::messageQuoteStyle.padding.left()
 		- st::messageQuoteStyle.padding.right()
 		- st::msgPadding.right();
-	WebpageDescriptionOptions.maxh = st::webPageDescriptionFont->height * 3;
 }
 
 const TextParseOptions &ItemTextDefaultOptions() {

From 9a5923676ab207bc83bcb64d19af4275f59f5a78 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 16:00:35 +0300
Subject: [PATCH 274/400] Added posting of payment event to webview bot after
 credits sending.

---
 Telegram/SourceFiles/boxes/send_credits_box.cpp |  1 -
 .../inline_bots/bot_attach_web_view.cpp         |  3 ++-
 .../payments/payments_non_panel_process.cpp     | 17 +++++++++++++++--
 .../payments/payments_non_panel_process.h       |  4 +++-
 .../settings/settings_credits_graphics.cpp      |  1 -
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 309f4833ce126..2873b4ffec05b 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -21,7 +21,6 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_form.h"
-#include "payments/payments_form.h"
 #include "settings/settings_credits_graphics.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/premium_graphics.h"
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 03561bdd6f40d..68da29a3a7376 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -610,7 +610,8 @@ void AttachWebView::botHandleInvoice(QString slug) {
 		reactivate,
 		_context
 			? Payments::ProcessNonPanelPaymentFormFactory(
-				_context->controller.get())
+				_context->controller.get(),
+				reactivate)
 			: nullptr);
 }
 
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index 62a3b4681ba84..efab4dd89f8e8 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -40,7 +40,8 @@ bool IsCreditsInvoice(not_null<HistoryItem*> item) {
 } // namespace
 
 Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
-		not_null<Window::SessionController*> controller) {
+		not_null<Window::SessionController*> controller,
+		Fn<void(CheckoutResult)> maybeReturnToBot) {
 	return [=](NonPanelPaymentForm form) {
 		using CreditsFormDataPtr = std::shared_ptr<CreditsFormData>;
 		using CreditsReceiptPtr = std::shared_ptr<CreditsReceiptData>;
@@ -51,12 +52,24 @@ Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
 				controller->session().user());
 			const auto sendBox = [=, weak = base::make_weak(controller)] {
 				if (const auto strong = weak.get()) {
-					controller->uiShow()->show(Box(
+					const auto unsuccessful = std::make_shared<bool>(true);
+					const auto box = controller->uiShow()->show(Box(
 						Ui::SendCreditsBox,
 						form,
 						crl::guard(strong, [=] {
+							*unsuccessful = false;
 							Ui::StartFireworks(strong->content());
+							if (maybeReturnToBot) {
+								maybeReturnToBot(CheckoutResult::Paid);
+							}
 						})));
+					box->boxClosing() | rpl::start_with_next([=] {
+						crl::on_main([=] {
+							if ((*unsuccessful) && maybeReturnToBot) {
+								maybeReturnToBot(CheckoutResult::Cancelled);
+							}
+						});
+					}, box->lifetime());
 				}
 			};
 			const auto weak = base::make_weak(controller);
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.h b/Telegram/SourceFiles/payments/payments_non_panel_process.h
index 76939415d22d8..fb647a72a35b9 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.h
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.h
@@ -15,10 +15,12 @@ class SessionController;
 
 namespace Payments {
 
+enum class CheckoutResult;
 struct NonPanelPaymentForm;
 
 Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
-	not_null<Window::SessionController*> controller);
+	not_null<Window::SessionController*> controller,
+	Fn<void(Payments::CheckoutResult)> maybeReturnToBot = nullptr);
 
 Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
 	not_null<Window::SessionController*> controller,
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 0cd0ae1a2fe64..066adf6f04ea2 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -23,7 +23,6 @@ For license and copyright information please follow this link:
 #include "settings/settings_common_session.h"
 #include "settings/settings_credits_graphics.h"
 #include "statistics/widgets/chart_header_widget.h"
-#include "ui/boxes/boost_box.h" // Ui::StartFireworks.
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"

From cd7507fb23b1fd4eaa07ec9cdf59a81fc69cb569 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 May 2024 16:28:35 +0300
Subject: [PATCH 275/400] Respected accessibility of premium for credits
 purchasing.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../payments/payments_non_panel_process.cpp   |  9 ++++++++-
 .../settings/settings_credits_graphics.cpp    | 19 ++++++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index eb8eecb58c04a..9d6823fb59276 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2328,6 +2328,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_small_balance_title#one" = "{count} Star Needed";
 "lng_credits_small_balance_title#other" = "{count} Stars Needed";
 "lng_credits_small_balance_about" = "Buy **Stars** and use them on **{bot}** and other miniapps.";
+"lng_credits_purchase_blocked" = "Sorry, you can't purchase this item with Telegram Stars.";
 
 "lng_location_title" = "Location";
 "lng_location_about" = "Display the location of your business on your account.";
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index efab4dd89f8e8..112cdd5762cf2 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -15,6 +15,7 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "mainwidget.h"
 #include "payments/payments_checkout_process.h" // NonPanelPaymentForm.
@@ -80,13 +81,19 @@ Fn<void(NonPanelPaymentForm)> ProcessNonPanelPaymentFormFactory(
 						- int64(slice.balance);
 					if (creditsNeeded <= 0) {
 						sendBox();
-					} else {
+					} else if (strong->session().premiumPossible()) {
 						strong->uiShow()->show(Box(
 							Settings::SmallBalanceBox,
 							strong,
 							creditsNeeded,
 							form->botId,
 							sendBox));
+					} else {
+						strong->uiShow()->showToast(
+							tr::lng_credits_purchase_blocked(tr::now));
+						if (maybeReturnToBot) {
+							maybeReturnToBot(CheckoutResult::Failed);
+						}
 					}
 				}
 				lifetime->destroy();
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 066adf6f04ea2..e9f825eadd3fd 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -286,11 +286,20 @@ void FillCreditOptions(
 	const auto apiCredits = content->lifetime().make_state<ApiOptions>(
 		controller->session().user());
 
-	apiCredits->request(
-	) | rpl::start_with_error_done([=](const QString &error) {
-		controller->showToast(error);
-	}, [=] {
-		fill(apiCredits->options());
+	if (controller->session().premiumPossible()) {
+		apiCredits->request(
+		) | rpl::start_with_error_done([=](const QString &error) {
+			controller->showToast(error);
+		}, [=] {
+			fill(apiCredits->options());
+		}, content->lifetime());
+	}
+
+	controller->session().premiumPossibleValue(
+	) | rpl::start_with_next([=](bool premiumPossible) {
+		if (!premiumPossible) {
+			fill({});
+		}
 	}, content->lifetime());
 }
 

From 58c060c59d2103dd1893d7f1ba47ed8799a9e0bd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 29 May 2024 02:37:56 +0300
Subject: [PATCH 276/400] Improved style of box for credits history entries for
 refunded entry.

---
 .../settings/settings_credits_graphics.cpp    | 73 ++++++++++++++-----
 1 file changed, 54 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index e9f825eadd3fd..16c15e44e9904 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -437,23 +437,38 @@ void ReceiptCreditsBox(
 		auto &lifetime = content->lifetime();
 		const auto text = lifetime.make_state<Ui::Text::String>(
 			st::semiboldTextStyle,
-			(!e.bareId ? QChar('+') : kMinus)
+			((!e.bareId || e.refunded) ? QChar('+') : kMinus)
 				+ Lang::FormatCountDecimal(std::abs(int64(e.credits))));
+		const auto refundedText = tr::lng_channel_earn_history_return(
+			tr::now);
+		const auto refunded = e.refunded
+			? lifetime.make_state<Ui::Text::String>(
+				st::defaultTextStyle,
+				refundedText)
+			: (Ui::Text::String*)(nullptr);
 
 		const auto amount = content->add(
 			object_ptr<Ui::FixedHeightWidget>(
 				content,
 				star.height() / style::DevicePixelRatio()));
 		const auto font = text->style()->font;
+		const auto refundedFont = st::defaultTextStyle.font;
+		const auto starWidth = star.width()
+			/ style::DevicePixelRatio();
+		const auto refundedSkip = refundedFont->spacew * 2;
+		const auto refundedWidth = refunded
+			? refundedFont->width(refundedText)
+				+ refundedSkip
+				+ refundedFont->height
+			: 0;
+		const auto fullWidth = text->maxWidth()
+			+ font->spacew * 1
+			+ starWidth
+			+ refundedWidth;
 		amount->paintRequest(
 		) | rpl::start_with_next([=] {
 			auto p = Painter(amount);
-			const auto starWidth = star.width()
-				/ style::DevicePixelRatio();
-			const auto fullWidth = text->maxWidth()
-				+ font->spacew * 2
-				+ starWidth;
-			p.setPen(!e.bareId
+			p.setPen((!e.bareId || e.refunded)
 				? st::boxTextFgGood
 				: st::menuIconAttentionColor);
 			const auto x = (amount->width() - fullWidth) / 2;
@@ -463,11 +478,41 @@ void ReceiptCreditsBox(
 					(amount->height() - font->height) / 2),
 				.outerWidth = amount->width(),
 				.availableWidth = amount->width(),
-			});;
+			});
 			p.drawImage(
-				x + fullWidth - starWidth,
+				x + fullWidth - starWidth - refundedWidth,
 				0,
 				star);
+
+			if (refunded) {
+				const auto refundedLeft = fullWidth
+					+ x
+					- refundedWidth
+					+ refundedSkip;
+				const auto pen = p.pen();
+				auto color = pen.color();
+				color.setAlphaF(color.alphaF() * 0.15);
+				p.setPen(Qt::NoPen);
+				p.setBrush(color);
+				{
+					auto hq = PainterHighQualityEnabler(p);
+					p.drawRoundedRect(
+						refundedLeft,
+						(amount->height() - refundedFont->height) / 2,
+						refundedWidth - refundedSkip,
+						refundedFont->height,
+						refundedFont->height / 2,
+						refundedFont->height / 2);
+				}
+				p.setPen(pen);
+				refunded->draw(p, Ui::Text::PaintContext{
+					.position = QPoint(
+						refundedLeft + refundedFont->height / 2,
+						(amount->height() - refundedFont->height) / 2),
+					.outerWidth = refundedWidth,
+					.availableWidth = refundedWidth,
+				});
+			}
 		}, amount->lifetime());
 	}
 
@@ -481,16 +526,6 @@ void ReceiptCreditsBox(
 				st::defaultFlatLabel)));
 	}
 
-	if (e.refunded) {
-		Ui::AddSkip(content);
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_channel_earn_history_return_about(),
-				st::defaultFlatLabel)));
-	}
-
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 

From d3a01b6235160285319ebf83fa323d975ae801d8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 29 May 2024 03:50:40 +0300
Subject: [PATCH 277/400] Improved style of list of credits history entries for
 entry photo.

---
 Telegram/CMakeLists.txt                       |  2 +
 .../info_statistics_list_controllers.cpp      | 20 ++++++-
 .../settings/settings_credits_graphics.cpp    | 36 ++----------
 .../ui/effects/credits_graphics.cpp           | 55 +++++++++++++++++++
 .../SourceFiles/ui/effects/credits_graphics.h |  6 ++
 Telegram/cmake/td_ui.cmake                    |  2 -
 6 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index d1171a5efed9e..6e786a6cdda1c 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1467,6 +1467,8 @@ PRIVATE
     ui/controls/silent_toggle.h
     ui/controls/userpic_button.cpp
     ui/controls/userpic_button.h
+    ui/effects/credits_graphics.cpp
+    ui/effects/credits_graphics.h
     ui/effects/emoji_fly_animation.cpp
     ui/effects/emoji_fly_animation.h
     ui/effects/message_sending_animation_common.h
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 0028e0fabe644..51dcc203b5c7c 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -713,6 +713,7 @@ class CreditsRow final : public PeerListRow {
 		Data::CreditsHistoryEntry entry;
 		not_null<QImage*> creditIcon;
 		int rowHeight = 0;
+		Fn<void(not_null<PeerListRow*>)> updateCallback;
 	};
 
 	CreditsRow(not_null<PeerData*> peer, const Descriptor &descriptor);
@@ -752,6 +753,14 @@ CreditsRow::CreditsRow(not_null<PeerData*> peer, const Descriptor &descriptor)
 , _entry(descriptor.entry)
 , _creditIcon(descriptor.creditIcon)
 , _rowHeight(descriptor.rowHeight) {
+	const auto photo = _entry.photoId
+		? peer->session().data().photo(_entry.photoId).get()
+		: nullptr;
+	if (photo) {
+		_paintUserpicCallback = Ui::GenerateCreditsPaintEntryCallback(
+			photo,
+			[this, update = descriptor.updateCallback] { update(this); });
+	}
 	init();
 }
 
@@ -772,9 +781,11 @@ void CreditsRow::init() {
 			(!_entry.bareId ? QChar('+') : kMinus)
 				+ Lang::FormatCountDecimal(std::abs(int64(_entry.credits))));
 	}
-	_paintUserpicCallback = !PeerListRow::special()
-		? PeerListRow::generatePaintUserpicCallback(false)
-		: Ui::GenerateCreditsPaintUserpicCallback(_entry);
+	if (!_paintUserpicCallback) {
+		_paintUserpicCallback = !PeerListRow::special()
+			? PeerListRow::generatePaintUserpicCallback(false)
+			: Ui::GenerateCreditsPaintUserpicCallback(_entry);
+	}
 }
 
 const Data::CreditsHistoryEntry &CreditsRow::entry() const {
@@ -912,6 +923,9 @@ void CreditsController::applySlice(const Data::CreditsStatusSlice &slice) {
 				.entry = item,
 				.creditIcon = _creditIcon,
 				.rowHeight = computeListSt().item.height,
+				.updateCallback = [=](not_null<PeerListRow*> row) {
+					delegate()->peerListUpdateRow(row);
+				},
 			};
 			using Type = Data::CreditsHistoryEntry::PeerType;
 			if (item.bareId) {
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 16c15e44e9904..b855121a455c0 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -568,44 +568,18 @@ object_ptr<Ui::RpWidget> HistoryEntryPhoto(
 		not_null<Ui::RpWidget*> parent,
 		not_null<PhotoData*> photo,
 		int photoSize) {
-	struct State {
-		std::shared_ptr<Data::PhotoMedia> view;
-		Image *image = nullptr;
-		rpl::lifetime downloadLifetime;
-	};
-	const auto state = parent->lifetime().make_state<State>();
 	auto owned = object_ptr<Ui::RpWidget>(parent);
 	const auto widget = owned.data();
-	state->view = photo->createMediaView();
-	photo->load(Data::PhotoSize::Thumbnail, {});
-
 	widget->resize(Size(photoSize));
 
-	rpl::single(rpl::empty_value()) | rpl::then(
-		photo->owner().session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
-		using Size = Data::PhotoSize;
-		if (const auto large = state->view->image(Size::Large)) {
-			state->image = large;
-		} else if (const auto small = state->view->image(Size::Small)) {
-			state->image = small;
-		} else if (const auto t = state->view->image(Size::Thumbnail)) {
-			state->image = t;
-		}
-		widget->update();
-		if (state->view->loaded()) {
-			state->downloadLifetime.destroy();
-		}
-	}, state->downloadLifetime);
+	const auto draw = Ui::GenerateCreditsPaintEntryCallback(
+		photo,
+		[=] { widget->update(); });
 
 	widget->paintRequest(
 	) | rpl::start_with_next([=] {
-		auto p = QPainter(widget);
-		if (state->image) {
-			p.drawPixmap(0, 0, state->image->pix(widget->width(), {
-				.options = Images::Option::RoundCircle,
-			}));
-		}
+		auto p = Painter(widget);
+		draw(p, 0, 0, photoSize, photoSize);
 	}, widget->lifetime());
 
 	return owned;
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
index 44e82195a9fc3..3c7a714f7120c 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
@@ -10,7 +10,12 @@ For license and copyright information please follow this link:
 #include <QtCore/QDateTime>
 
 #include "data/data_credits.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo.h"
+#include "data/data_photo_media.h"
+#include "data/data_session.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
 #include "ui/empty_userpic.h"
 #include "ui/painter.h"
 #include "styles/style_credits.h"
@@ -67,6 +72,56 @@ PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 	};
 }
 
+Fn<void(Painter &, int, int, int, int)> GenerateCreditsPaintEntryCallback(
+		not_null<PhotoData*> photo,
+		Fn<void()> update) {
+	struct State {
+		std::shared_ptr<Data::PhotoMedia> view;
+		Image *imagePtr = nullptr;
+		QImage image;
+		rpl::lifetime downloadLifetime;
+		bool entryImageLoaded = false;
+	};
+	const auto state = std::make_shared<State>();
+	state->view = photo->createMediaView();
+	photo->load(Data::PhotoSize::Thumbnail, {});
+
+	rpl::single(rpl::empty_value()) | rpl::then(
+		photo->owner().session().downloaderTaskFinished()
+	) | rpl::start_with_next([=] {
+		using Size = Data::PhotoSize;
+		if (const auto large = state->view->image(Size::Large)) {
+			state->imagePtr = large;
+		} else if (const auto small = state->view->image(Size::Small)) {
+			state->imagePtr = small;
+		} else if (const auto t = state->view->image(Size::Thumbnail)) {
+			state->imagePtr = t;
+		}
+		update();
+		if (state->view->loaded()) {
+			state->entryImageLoaded = true;
+			state->downloadLifetime.destroy();
+		}
+	}, state->downloadLifetime);
+
+	return [=](Painter &p, int x, int y, int outerWidth, int size) {
+		if (state->imagePtr
+			&& (!state->entryImageLoaded || state->image.isNull())) {
+			const auto image = state->imagePtr->original();
+			const auto minSize = std::min(image.width(), image.height());
+			state->image = Images::Prepare(
+				image.copy(
+					(image.width() - minSize) / 2,
+					(image.height() - minSize) / 2,
+					minSize,
+					minSize),
+				size * style::DevicePixelRatio(),
+				{ .options = Images::Option::RoundCircle });
+		}
+		p.drawImage(x, y, state->image);
+	};
+}
+
 TextWithEntities GenerateEntryName(const Data::CreditsHistoryEntry &entry) {
 	return ((entry.peerType == Data::CreditsHistoryEntry::PeerType::Fragment)
 		? tr::lng_bot_username_description1_link
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.h b/Telegram/SourceFiles/ui/effects/credits_graphics.h
index 44d848748a15a..ddfbea07cfec2 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.h
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.h
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+class PhotoData;
+
 namespace Data {
 struct CreditsHistoryEntry;
 } // namespace Data
@@ -16,6 +18,10 @@ namespace Ui {
 Fn<void(Painter &, int, int, int, int)> GenerateCreditsPaintUserpicCallback(
 	const Data::CreditsHistoryEntry &entry);
 
+Fn<void(Painter &, int, int, int, int)> GenerateCreditsPaintEntryCallback(
+	not_null<PhotoData*> photo,
+	Fn<void()> update);
+
 [[nodiscard]] TextWithEntities GenerateEntryName(
 	const Data::CreditsHistoryEntry &entry);
 
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 3c0c026a38caf..29a2c10b007ed 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -358,8 +358,6 @@ PRIVATE
     ui/effects/fireworks_animation.h
     ui/effects/glare.cpp
     ui/effects/glare.h
-    ui/effects/credits_graphics.cpp
-    ui/effects/credits_graphics.h
     ui/effects/loading_element.cpp
     ui/effects/loading_element.h
     ui/effects/outline_segments.cpp

From 57ecc2be1d3146271d9aad4f40416b9224b3c422 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 29 May 2024 03:50:52 +0300
Subject: [PATCH 278/400] Improved style of list of credits history entries for
 refunded entry.

---
 .../info_statistics_list_controllers.cpp      | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 51dcc203b5c7c..2dd25c5715067 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -744,6 +744,7 @@ class CreditsRow final : public PeerListRow {
 	const int _rowHeight;
 
 	PaintRoundImageCallback _paintUserpicCallback;
+	QString _name;
 
 	Ui::Text::String _rightText;
 };
@@ -773,12 +774,21 @@ CreditsRow::CreditsRow(const Descriptor &descriptor)
 }
 
 void CreditsRow::init() {
-	PeerListRow::setCustomStatus(langDateTimeFull(_entry.date));
+	_name = !PeerListRow::special()
+		? PeerListRow::generateName()
+		: Ui::GenerateEntryName(_entry).text;
+	const auto joiner = QString(QChar(' ')) + QChar(8212) + QChar(' ');
+	PeerListRow::setCustomStatus(
+		langDateTimeFull(_entry.date)
+		+ (_entry.refunded
+			? (joiner + tr::lng_channel_earn_history_return(tr::now))
+			: QString())
+		+ (_entry.title.isEmpty() ? QString() : (joiner + _name)));
 	{
 		constexpr auto kMinus = QChar(0x2212);
 		_rightText.setText(
 			st::semiboldTextStyle,
-			(!_entry.bareId ? QChar('+') : kMinus)
+			((!_entry.bareId || _entry.refunded) ? QChar('+') : kMinus)
 				+ Lang::FormatCountDecimal(std::abs(int64(_entry.credits))));
 	}
 	if (!_paintUserpicCallback) {
@@ -793,9 +803,7 @@ const Data::CreditsHistoryEntry &CreditsRow::entry() const {
 }
 
 QString CreditsRow::generateName() {
-	return !PeerListRow::special()
-		? PeerListRow::generateName()
-		: Ui::GenerateEntryName(_entry).text;
+	return _entry.title.isEmpty() ? _name : _entry.title;
 }
 
 PaintRoundImageCallback CreditsRow::generatePaintUserpicCallback(bool force) {
@@ -828,7 +836,7 @@ void CreditsRow::rightActionPaint(
 		bool actionSelected) {
 	const auto &font = _rightText.style()->font;
 	y += _rowHeight / 2;
-	p.setPen(!_entry.bareId
+	p.setPen((!_entry.bareId || _entry.refunded)
 		? st::boxTextFgGood
 		: st::menuIconAttentionColor);
 	x += st::creditsHistoryRightSkip;

From 02bd2bca64d004492aae8c4eaa2f258cc5b4ee0b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 29 May 2024 03:59:27 +0300
Subject: [PATCH 279/400] Removed display of credits button in settings when
 user has no credits.

---
 .../SourceFiles/settings/settings_main.cpp    | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 9f2e73072b24c..d08ce9a11c09c 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -491,20 +491,30 @@ void SetupPremium(
 		controller->setPremiumRef("settings");
 		showOther(PremiumId());
 	});
-	AddPremiumStar(
-		AddButtonWithLabel(
-			container,
-			tr::lng_credits_summary_title(),
+	{
+		const auto wrap = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		wrap->toggleOn(
 			controller->session().creditsValue(
-			) | rpl::map([=](uint64 c) {
-				return c ? Lang::FormatCountToShort(c).string : QString{};
-			}),
-			st::settingsButton),
-		true
-	)->addClickHandler([=] {
-		controller->setPremiumRef("settings");
-		showOther(CreditsId());
-	});
+			) | rpl::map(rpl::mappers::_1 > 0));
+		wrap->finishAnimating();
+		AddPremiumStar(
+			AddButtonWithLabel(
+				wrap->entity(),
+				tr::lng_credits_summary_title(),
+				controller->session().creditsValue(
+				) | rpl::map([=](uint64 c) {
+					return c ? Lang::FormatCountToShort(c).string : QString{};
+				}),
+				st::settingsButton),
+			true
+		)->addClickHandler([=] {
+			controller->setPremiumRef("settings");
+			showOther(CreditsId());
+		});
+	}
 	const auto button = AddButtonWithIcon(
 		container,
 		tr::lng_business_title(),

From d219bccf2b74436b351fe5f4c672685fab43b25d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 29 May 2024 04:24:47 +0300
Subject: [PATCH 280/400] Fixed position of via bot header above reply in
 message view.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index b860c2c5814e8..ddcd5e2798db1 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1301,8 +1301,8 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 			paintFromName(p, trect, context);
 			paintTopicButton(p, trect, context);
 			paintForwardedInfo(p, trect, context);
-			paintReplyInfo(p, trect, context);
 			paintViaBotIdInfo(p, trect, context);
+			paintReplyInfo(p, trect, context);
 		}
 		if (entry) {
 			trect.setHeight(trect.height() - entry->height());
@@ -4147,17 +4147,17 @@ QRect Message::innerGeometry() const {
 				+ st::topicButtonPadding.bottom()
 				+ st::topicButtonSkip);
 		}
-		// Skip displayForwardedFrom() until there are no animations for it.
-		if (const auto reply = Get<Reply>()) {
-			// See paintReplyInfo().
-			result.translate(0, reply->height());
-		}
 		if (!displayFromName() && !displayForwardedFrom()) {
 			// See paintViaBotIdInfo().
 			if (data()->Has<HistoryMessageVia>()) {
 				result.translate(0, st::msgServiceNameFont->height);
 			}
 		}
+		// Skip displayForwardedFrom() until there are no animations for it.
+		if (const auto reply = Get<Reply>()) {
+			// See paintReplyInfo().
+			result.translate(0, reply->height());
+		}
 	}
 	return result;
 }

From 924d80ecba3285b75ba58da36887f55dd85918e8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 09:37:32 +0400
Subject: [PATCH 281/400] Use message text rendering for media captions.

---
 .../history/view/history_view_element.cpp     |  26 ++-
 .../history/view/history_view_element.h       |   3 +
 .../history/view/history_view_message.cpp     |  33 ++--
 .../history/view/history_view_message.h       |   1 -
 .../view/media/history_view_document.cpp      |  83 +++------
 .../view/media/history_view_document.h        |  12 +-
 .../media/history_view_extended_preview.cpp   | 109 +-----------
 .../media/history_view_extended_preview.h     |  29 +---
 .../history/view/media/history_view_gif.cpp   | 158 ++++-------------
 .../history/view/media/history_view_gif.h     |  37 +---
 .../history/view/media/history_view_invoice.h |   3 +
 .../history/view/media/history_view_media.cpp |   6 +-
 .../history/view/media/history_view_media.h   |  13 +-
 .../view/media/history_view_media_grouped.cpp | 161 +++++-------------
 .../view/media/history_view_media_grouped.h   |  15 +-
 .../history/view/media/history_view_photo.cpp | 128 ++------------
 .../history/view/media/history_view_photo.h   |  33 +---
 .../view/media/history_view_web_page.h        |   3 +
 18 files changed, 225 insertions(+), 628 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 82688196a096d..3cdb44ed00a30 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -775,6 +775,10 @@ void Element::refreshMedia(Element *replacing) {
 	}
 }
 
+HistoryItem *Element::textItem() const {
+	return _textItem;
+}
+
 Ui::Text::IsolatedEmoji Element::isolatedEmoji() const {
 	return _text.toIsolatedEmoji();
 }
@@ -952,11 +956,11 @@ auto Element::contextDependentServiceText() -> TextWithLinks {
 
 void Element::validateText() {
 	const auto item = data();
-	const auto &text = item->_text;
 	const auto media = item->media();
 	const auto storyMention = media && media->storyMention();
 	if (media && media->storyExpired()) {
 		_media = nullptr;
+		_textItem = item;
 		if (!storyMention) {
 			if (_text.isEmpty()) {
 				setTextWithLinks(Ui::Text::Italic(
@@ -965,6 +969,16 @@ void Element::validateText() {
 			return;
 		}
 	}
+
+	// Albums may show text of a different item than the parent one.
+	_textItem = _media ? _media->itemForText() : item.get();
+	if (!_textItem) {
+		if (!_text.isEmpty()) {
+			setTextWithLinks({});
+		}
+		return;
+	}
+	const auto &text = _textItem->_text;
 	if (_text.isEmpty() == text.empty()) {
 	} else if (_flags & Flag::ServiceMessage) {
 		const auto contextDependentText = contextDependentServiceText();
@@ -972,11 +986,11 @@ void Element::validateText() {
 			? text
 			: contextDependentText.text;
 		const auto &customLinks = contextDependentText.text.empty()
-			? item->customTextLinks()
+			? _textItem->customTextLinks()
 			: contextDependentText.links;
 		setTextWithLinks(markedText, customLinks);
 	} else {
-		setTextWithLinks(item->translatedTextWithLocalEntities());
+		setTextWithLinks(_textItem->translatedTextWithLocalEntities());
 	}
 }
 
@@ -1407,6 +1421,12 @@ bool Element::hasVisibleText() const {
 	return false;
 }
 
+int Element::textualMaxWidth() const {
+	return st::msgPadding.left()
+		+ (hasVisibleText() ? text().maxWidth() : 0)
+		+ st::msgPadding.right();
+}
+
 auto Element::verticalRepaintRange() const -> VerticalRepaintRange {
 	return {
 		.top = 0,
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index ab458b1a5ddd2..fdac9a58385ac 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -373,6 +373,7 @@ class Element
 			&& _text.isOnlyCustomEmoji();
 	}
 
+	[[nodiscard]] HistoryItem *textItem() const;
 	[[nodiscard]] Ui::Text::IsolatedEmoji isolatedEmoji() const;
 	[[nodiscard]] Ui::Text::OnlyCustomEmoji onlyCustomEmoji() const;
 
@@ -476,6 +477,7 @@ class Element
 		std::optional<QPoint> pressPoint) const;
 	[[nodiscard]] virtual TimeId displayedEditDate() const;
 	[[nodiscard]] virtual bool hasVisibleText() const;
+	[[nodiscard]] int textualMaxWidth() const;
 	virtual void applyGroupAdminChanges(
 		const base::flat_set<UserId> &changes) {
 	}
@@ -633,6 +635,7 @@ class Element
 	mutable ClickHandlerPtr _fromLink;
 	const QDateTime _dateTime;
 
+	HistoryItem *_textItem = nullptr;
 	mutable Ui::Text::String _text;
 	mutable int _textWidth = -1;
 	mutable int _textHeight = 0;
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index ddcd5e2798db1..133a19973aa1d 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -406,7 +406,6 @@ Message::Message(
 	not_null<HistoryItem*> data,
 	Element *replacing)
 : Element(delegate, data, replacing, Flag(0))
-, _invertMedia(data->invertMedia() && !data->emptyText())
 , _hideReply(delegate->elementHideReply(this))
 , _bottomInfo(
 		&data->history()->owner().reactions(),
@@ -826,6 +825,15 @@ QSize Message::performCountOptimalSize() {
 	validateInlineKeyboard(markup);
 	updateViewButtonExistence();
 	refreshTopicButton();
+
+	const auto media = this->media();
+	const auto textItem = this->textItem();
+	const auto defaultInvert = media && media->aboveTextByDefault();
+	const auto invertDefault = textItem
+		&& textItem->invertMedia()
+		&& !textItem->emptyText();
+	_invertMedia = invertDefault ? !defaultInvert : defaultInvert;
+
 	updateMediaInBubbleState();
 	if (oldKey != reactionsKey()) {
 		refreshReactions();
@@ -833,7 +841,6 @@ QSize Message::performCountOptimalSize() {
 	refreshRightBadge();
 	refreshInfoSkipBlock();
 
-	const auto media = this->media();
 	const auto botTop = item->isFakeAboutView()
 		? Get<FakeBotAboutTop>()
 		: nullptr;
@@ -877,9 +884,10 @@ QSize Message::performCountOptimalSize() {
 
 		// Entry page is always a bubble bottom.
 		const auto withVisibleText = hasVisibleText();
+		const auto textualWidth = textualMaxWidth();
 		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
-		maxWidth = plainMaxWidth();
+		maxWidth = textualWidth;
 		if (context() == Context::Replies && item->isDiscussionPost()) {
 			maxWidth = std::max(maxWidth, st::msgMaxWidth);
 		}
@@ -930,7 +938,7 @@ QSize Message::performCountOptimalSize() {
 					if (botTop) {
 						minHeight += botTop->height;
 					}
-					if (maxWidth < plainMaxWidth()) {
+					if (maxWidth < textualWidth) {
 						minHeight -= text().minHeight();
 						minHeight += text().countHeight(innerWidth);
 					}
@@ -3432,12 +3440,6 @@ void Message::refreshDataIdHook() {
 	}
 }
 
-int Message::plainMaxWidth() const {
-	return st::msgPadding.left()
-		+ (hasVisibleText() ? text().maxWidth() : 0)
-		+ st::msgPadding.right();
-}
-
 int Message::monospaceMaxWidth() const {
 	return st::msgPadding.left()
 		+ (hasVisibleText() ? text().countMaxMonospaceWidth() : 0)
@@ -4189,7 +4191,7 @@ QRect Message::countGeometry() const {
 	accumulate_min(contentWidth, maxWidth());
 	accumulate_min(contentWidth, int(_bubbleWidthLimit));
 	if (mediaWidth < contentWidth) {
-		const auto textualWidth = plainMaxWidth();
+		const auto textualWidth = textualMaxWidth();
 		if (mediaWidth < textualWidth
 			&& (!media || !media->enforceBubbleWidth())) {
 			accumulate_min(contentWidth, textualWidth);
@@ -4300,7 +4302,7 @@ int Message::resizeContentGetHeight(int newWidth) {
 	if (mediaDisplayed) {
 		media->resizeGetHeight(contentWidth);
 		if (media->width() < contentWidth) {
-			const auto textualWidth = plainMaxWidth();
+			const auto textualWidth = textualMaxWidth();
 			if (media->width() < textualWidth
 				&& !media->enforceBubbleWidth()) {
 				accumulate_min(contentWidth, textualWidth);
@@ -4474,8 +4476,11 @@ bool Message::invertMedia() const {
 }
 
 bool Message::hasVisibleText() const {
-	if (data()->emptyText()) {
-		if (const auto media = data()->media()) {
+	const auto textItem = this->textItem();
+	if (!textItem) {
+		return false;
+	} else if (textItem->emptyText()) {
+		if (const auto media = textItem->media()) {
 			return media->storyExpired();
 		}
 		return false;
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index 240e1a47a43fd..5c61fdaaaf96d 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -287,7 +287,6 @@ class Message final : public Element {
 	void ensureRightAction() const;
 	void refreshTopicButton();
 	void refreshInfoSkipBlock();
-	[[nodiscard]] int plainMaxWidth() const;
 	[[nodiscard]] int monospaceMaxWidth() const;
 
 	void validateInlineKeyboard(HistoryMessageReplyMarkup *markup);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index bb64302c74b0e..e415264b3bd6f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -300,9 +300,7 @@ Document::Document(
 		_transcribedRound = entry.shown;
 	}
 
-	auto caption = createCaption();
-
-	createComponents(!caption.isEmpty());
+	createComponents();
 	if (const auto named = Get<HistoryDocumentNamed>()) {
 		fillNamedFromData(named);
 		_tooltipFilename.setTooltipText(named->name);
@@ -346,10 +344,6 @@ Document::Document(
 	}
 
 	setStatusSize(Ui::FileStatusSizeReady);
-
-	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
-		captioned->caption = std::move(caption);
-	}
 }
 
 Document::~Document() {
@@ -374,7 +368,7 @@ bool Document::dataLoaded() const {
 	return _dataMedia->loaded();
 }
 
-void Document::createComponents(bool caption) {
+void Document::createComponents() {
 	uint64 mask = 0;
 	if (_data->isVoiceMessage() || _transcribedRound) {
 		mask |= HistoryDocumentVoice::Bit();
@@ -385,9 +379,6 @@ void Document::createComponents(bool caption) {
 			mask |= HistoryDocumentThumbed::Bit();
 		}
 	}
-	if (caption) {
-		mask |= HistoryDocumentCaptioned::Bit();
-	}
 	UpdateComponents(mask);
 	if (const auto thumbed = Get<HistoryDocumentThumbed>()) {
 		thumbed->linksavel = std::make_shared<DocumentSaveClickHandler>(
@@ -421,18 +412,6 @@ void Document::fillNamedFromData(not_null<HistoryDocumentNamed*> named) {
 }
 
 QSize Document::countOptimalSize() {
-	auto captioned = Get<HistoryDocumentCaptioned>();
-	if (_parent->media() != this && !_realParent->groupId()) {
-		if (captioned) {
-			RemoveComponents(HistoryDocumentCaptioned::Bit());
-			captioned = nullptr;
-		}
-	} else if (captioned && captioned->caption.hasSkipBlock()) {
-		captioned->caption.updateSkipBlock(
-			_parent->skipBlockWidth(),
-			_parent->skipBlockHeight());
-	}
-
 	auto hasTranscribe = false;
 	const auto voice = Get<HistoryDocumentVoice>();
 	if (voice) {
@@ -481,7 +460,7 @@ QSize Document::countOptimalSize() {
 					st::messageTextStyle,
 					text);
 				hasTranscribe = true;
-				if (const auto skipBlockWidth = captioned
+				if (const auto skipBlockWidth = _parent->hasVisibleText()
 					? 0
 					: _parent->skipBlockWidth()) {
 					voice->transcribeText.updateSkipBlock(
@@ -528,7 +507,7 @@ QSize Document::countOptimalSize() {
 	}
 
 	auto minHeight = st.padding.top() + st.thumbSize + st.padding.bottom();
-	if (!captioned && !hasTranscribe && _parent->bottomInfoIsWide()) {
+	if (isBubbleBottom() && !hasTranscribe && _parent->bottomInfoIsWide()) {
 		minHeight += st::msgDateFont->height - st::msgDateDelta.y();
 	}
 	if (!isBubbleTop()) {
@@ -540,17 +519,6 @@ QSize Document::countOptimalSize() {
 			- st::msgPadding.left()
 			- st::msgPadding.right();
 		minHeight += voice->transcribeText.countHeight(captionw);
-		if (captioned) {
-			minHeight += st::mediaCaptionSkip;
-		} else if (isBubbleBottom()) {
-			minHeight += st::msgPadding.bottom();
-		}
-	}
-	if (captioned) {
-		auto captionw = maxWidth
-			- st::msgPadding.left()
-			- st::msgPadding.right();
-		minHeight += captioned->caption.countHeight(captionw);
 		if (isBubbleBottom()) {
 			minHeight += st::msgPadding.bottom();
 		}
@@ -1521,10 +1489,32 @@ QMargins Document::bubbleMargins() const {
 	return QMargins(padding.left(), padding.top(), padding.right(), padding.bottom());
 }
 
-QSize Document::sizeForGroupingOptimal(int maxWidth) const {
+void Document::refreshCaption(bool last) {
+	auto caption = createCaption();
+	if (!caption.isEmpty()) {
+		AddComponents(HistoryDocumentCaptioned::Bit());
+		auto captioned = Get<HistoryDocumentCaptioned>();
+		captioned->caption = std::move(caption);
+		const auto skip = last ? _parent->skipBlockWidth() : 0;
+		if (skip) {
+			captioned->caption.updateSkipBlock(
+				_parent->skipBlockWidth(),
+				_parent->skipBlockHeight());
+		} else {
+			captioned->caption.removeSkipBlock();
+		}
+	} else {
+		RemoveComponents(HistoryDocumentCaptioned::Bit());
+	}
+}
+
+QSize Document::sizeForGroupingOptimal(int maxWidth, bool last) const {
 	const auto thumbed = Get<HistoryDocumentThumbed>();
 	const auto &st = (thumbed ? st::msgFileThumbLayoutGrouped : st::msgFileLayoutGrouped);
 	auto height = st.padding.top() + st.thumbSize + st.padding.bottom();
+
+	const_cast<Document*>(this)->refreshCaption(last);
+
 	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
 		auto captionw = maxWidth
 			- st::msgPadding.left()
@@ -1647,33 +1637,16 @@ void Document::refreshParentId(not_null<HistoryItem*> realParent) {
 }
 
 void Document::parentTextUpdated() {
-	auto caption = (_parent->media() == this || _realParent->groupId())
-		? createCaption()
-		: Ui::Text::String();
-	if (!caption.isEmpty()) {
-		AddComponents(HistoryDocumentCaptioned::Bit());
-		auto captioned = Get<HistoryDocumentCaptioned>();
-		captioned->caption = std::move(caption);
-	} else {
-		RemoveComponents(HistoryDocumentCaptioned::Bit());
-	}
 	history()->owner().requestViewResize(_parent);
 }
 
-TextWithEntities Document::getCaption() const {
-	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
-		return captioned->caption.toTextWithEntities();
-	}
-	return TextWithEntities();
-}
-
 void Document::hideSpoilers() {
 	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
 		captioned->caption.setSpoilerRevealed(false, anim::type::instant);
 	}
 }
 
-Ui::Text::String Document::createCaption() {
+Ui::Text::String Document::createCaption() const {
 	return File::createCaption(_realParent);
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.h b/Telegram/SourceFiles/history/view/media/history_view_document.h
index 3d29651c43d2d..2f8ec9ac22fe2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.h
@@ -35,6 +35,10 @@ class Document final
 		not_null<DocumentData*> document);
 	~Document();
 
+	bool hideMessageText() const override {
+		return false;
+	}
+
 	void draw(Painter &p, const PaintContext &context) const override;
 	TextState textState(QPoint point, StateRequest request) const override;
 	void updatePressed(QPoint point) override;
@@ -56,7 +60,6 @@ class Document final
 		return _data;
 	}
 
-	TextWithEntities getCaption() const override;
 	void hideSpoilers() override;
 	bool needsBubble() const override {
 		return true;
@@ -66,7 +69,7 @@ class Document final
 	}
 	QMargins bubbleMargins() const override;
 
-	QSize sizeForGroupingOptimal(int maxWidth) const override;
+	QSize sizeForGroupingOptimal(int maxWidth, bool last) const override;
 	QSize sizeForGrouping(int width) const override;
 	void drawGrouped(
 		Painter &p,
@@ -117,12 +120,13 @@ class Document final
 		LayoutMode mode) const;
 	void ensureDataMediaCreated() const;
 
-	[[nodiscard]] Ui::Text::String createCaption();
+	[[nodiscard]] Ui::Text::String createCaption() const;
 
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
 
-	void createComponents(bool caption);
+	void refreshCaption(bool last);
+	void createComponents();
 	void fillNamedFromData(not_null<HistoryDocumentNamed*> named);
 
 	[[nodiscard]] Ui::BubbleRounding thumbRounding(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
index 9db9acc07a678..7d5b9f00a462b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
@@ -57,10 +57,8 @@ ExtendedPreview::ExtendedPreview(
 	not_null<Element*> parent,
 	not_null<Data::Invoice*> invoice)
 : Media(parent)
-, _invoice(invoice)
-, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
+, _invoice(invoice) {
 	const auto item = parent->data();
-	_caption = createCaption(item);
 	_spoiler.link = MakeInvoiceLink(item);
 	resolveButtonText();
 }
@@ -113,17 +111,9 @@ void ExtendedPreview::unloadHeavyPart() {
 		= _spoiler.cornerCache
 		= _buttonBackground = QImage();
 	_spoiler.animation = nullptr;
-	_caption.unloadPersistentAnimation();
 }
 
 QSize ExtendedPreview::countOptimalSize() {
-	if (_parent->media() != this) {
-		_caption = Ui::Text::String();
-	} else if (_caption.hasSkipBlock()) {
-		_caption.updateSkipBlock(
-			_parent->skipBlockWidth(),
-			_parent->skipBlockHeight());
-	}
 	const auto &preview = _invoice->extendedPreview;
 	const auto dimensions = preview.dimensions;
 	const auto minWidth = std::min(
@@ -141,15 +131,6 @@ QSize ExtendedPreview::countOptimalSize() {
 	if (preview.videoDuration < 0) {
 		accumulate_max(maxWidth, scaled.height());
 	}
-	if (_parent->hasBubble() && !_caption.isEmpty()) {
-		maxWidth = qMax(maxWidth, st::msgPadding.left()
-			+ _caption.maxWidth()
-			+ st::msgPadding.right());
-		minHeight += st::mediaCaptionSkip + _caption.minHeight();
-		if (isBubbleBottom()) {
-			minHeight += st::msgPadding.bottom();
-		}
-	}
 	return { maxWidth, minHeight };
 }
 
@@ -157,7 +138,7 @@ QSize ExtendedPreview::countCurrentSize(int newWidth) {
 	const auto &preview = _invoice->extendedPreview;
 	const auto dimensions = preview.dimensions;
 	const auto thumbMaxWidth = std::min(newWidth, st::maxMediaSize);
-		const auto minWidth = std::min(
+	const auto minWidth = std::min(
 		std::max({
 			_parent->minWidthForMedia(),
 			(_parent->hasBubble()
@@ -176,20 +157,11 @@ QSize ExtendedPreview::countCurrentSize(int newWidth) {
 			maxWidth());
 	newWidth = qMax(scaled.width(), minWidth);
 	auto newHeight = qMax(scaled.height(), st::minPhotoSize);
-	if (_parent->hasBubble() && !_caption.isEmpty()) {
+	if (_parent->hasBubble()) {
 		const auto maxWithCaption = qMin(
 			st::msgMaxWidth,
-			(st::msgPadding.left()
-				+ _caption.maxWidth()
-				+ st::msgPadding.right()));
+			_parent->textualMaxWidth());
 		newWidth = qMin(qMax(newWidth, maxWithCaption), thumbMaxWidth);
-		const auto captionw = newWidth
-			- st::msgPadding.left()
-			- st::msgPadding.right();
-		newHeight += st::mediaCaptionSkip + _caption.countHeight(captionw);
-		if (isBubbleBottom()) {
-			newHeight += st::msgPadding.bottom();
-		}
 	}
 	return { newWidth, newHeight };
 }
@@ -210,16 +182,8 @@ void ExtendedPreview::draw(Painter &p, const PaintContext &context) const {
 	const auto inWebPage = (_parent->media() != this);
 	const auto rounding = inWebPage
 		? std::optional<Ui::BubbleRounding>()
-		: adjustedBubbleRoundingWithCaption(_caption);
-	if (bubble) {
-		if (!_caption.isEmpty()) {
-			painth -= st::mediaCaptionSkip + _caption.countHeight(captionw);
-			if (isBubbleBottom()) {
-				painth -= st::msgPadding.bottom();
-			}
-			rthumb = style::rtlrect(paintx, painty, paintw, painth, width());
-		}
-	} else {
+		: adjustedBubbleRounding();
+	if (!bubble) {
 		Assert(rounding.has_value());
 		fillImageShadow(p, rthumb, *rounding, context);
 	}
@@ -232,27 +196,7 @@ void ExtendedPreview::draw(Painter &p, const PaintContext &context) const {
 	}
 
 	// date
-	if (!_caption.isEmpty()) {
-		p.setPen(stm->historyTextFg);
-		_parent->prepareCustomEmojiPaint(p, context, _caption);
-		auto highlightRequest = context.computeHighlightCache();
-		_caption.draw(p, {
-			.position = QPoint(
-				st::msgPadding.left(),
-				painty + painth + st::mediaCaptionSkip),
-			.availableWidth = captionw,
-			.palette = &stm->textPalette,
-			.pre = stm->preCache.get(),
-			.blockquote = context.quoteCache(parent()->contentColorIndex()),
-			.colors = context.st->highlightColors(),
-			.spoiler = Ui::Text::DefaultSpoilerCache(),
-			.now = context.now,
-			.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
-			.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
-			.selection = context.selection,
-			.highlight = highlightRequest ? &*highlightRequest : nullptr,
-		});
-	} else if (!inWebPage) {
+	if (!inWebPage) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = painty + painth;
 		if (needInfoDisplay()) {
@@ -349,28 +293,10 @@ TextState ExtendedPreview::textState(QPoint point, StateRequest request) const {
 	}
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	auto bubble = _parent->hasBubble();
-
-	if (bubble && !_caption.isEmpty()) {
-		const auto captionw = paintw
-			- st::msgPadding.left()
-			- st::msgPadding.right();
-		painth -= _caption.countHeight(captionw);
-		if (isBubbleBottom()) {
-			painth -= st::msgPadding.bottom();
-		}
-		if (QRect(st::msgPadding.left(), painth, captionw, height() - painth).contains(point)) {
-			result = TextState(_parent, _caption.getState(
-				point - QPoint(st::msgPadding.left(), painth),
-				captionw,
-				request.forText()));
-			return result;
-		}
-		painth -= st::mediaCaptionSkip;
-	}
 	if (QRect(paintx, painty, paintw, painth).contains(point)) {
 		result.link = _spoiler.link;
 	}
-	if (_caption.isEmpty() && _parent->media() == this) {
+	if (!bubble && _parent->media() == this) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = painty + painth;
 		const auto bottomInfoResult = _parent->bottomInfoTextState(
@@ -412,23 +338,13 @@ bool ExtendedPreview::needInfoDisplay() const {
 		|| _parent->isLastAndSelfMessage();
 }
 
-TextForMimeData ExtendedPreview::selectedText(TextSelection selection) const {
-	return _caption.toTextForMimeData(selection);
-}
-
-void ExtendedPreview::hideSpoilers() {
-	_caption.setSpoilerRevealed(false, anim::type::instant);
-}
-
 bool ExtendedPreview::needsBubble() const {
-	if (!_caption.isEmpty()) {
-		return true;
-	}
 	const auto item = _parent->data();
 	return !item->isService()
 		&& (item->repliesAreComments()
 			|| item->externalReply()
 			|| item->viaBot()
+			|| !item->emptyText()
 			|| _parent->displayReply()
 			|| _parent->displayForwardedFrom()
 			|| _parent->displayFromName()
@@ -441,11 +357,4 @@ QPoint ExtendedPreview::resolveCustomInfoRightBottom() const {
 	return QPoint(width() - skipx, height() - skipy);
 }
 
-void ExtendedPreview::parentTextUpdated() {
-	_caption = (_parent->media() == this)
-		? createCaption(_parent->data())
-		: Ui::Text::String();
-	history()->owner().requestViewResize(_parent);
-}
-
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.h b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.h
index 8bec021549724..0e645456ee79b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.h
@@ -31,6 +31,10 @@ class ExtendedPreview final : public Media {
 		not_null<Data::Invoice*> invoice);
 	~ExtendedPreview();
 
+	bool hideMessageText() const override {
+		return false;
+	}
+
 	void draw(Painter &p, const PaintContext &context) const override;
 	TextState textState(QPoint point, StateRequest request) const override;
 
@@ -39,35 +43,15 @@ class ExtendedPreview final : public Media {
 	[[nodiscard]] bool dragItemByHandler(
 		const ClickHandlerPtr &p) const override;
 
-	[[nodiscard]] TextSelection adjustSelection(
-			TextSelection selection,
-			TextSelectType type) const override {
-		return _caption.adjustSelection(selection, type);
-	}
-	uint16 fullSelectionLength() const override {
-		return _caption.length();
-	}
-	bool hasTextForCopy() const override {
-		return !_caption.isEmpty();
-	}
-
-	TextForMimeData selectedText(TextSelection selection) const override;
-
-	TextWithEntities getCaption() const override {
-		return _caption.toTextWithEntities();
-	}
-	void hideSpoilers() override;
 	bool needsBubble() const override;
 	bool customInfoLayout() const override {
-		return _caption.isEmpty();
+		return true;
 	}
 	QPoint resolveCustomInfoRightBottom() const override;
 	bool skipBubbleTail() const override {
-		return isRoundedInBubbleBottom() && _caption.isEmpty();
+		return isRoundedInBubbleBottom();
 	}
 
-	void parentTextUpdated() override;
-
 	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
@@ -90,7 +74,6 @@ class ExtendedPreview final : public Media {
 		const PaintContext &context) const;
 
 	const not_null<Data::Invoice*> _invoice;
-	Ui::Text::String _caption;
 	mutable MediaSpoiler _spoiler;
 	mutable QImage _inlineThumbnail;
 	mutable QImage _buttonBackground;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 7dbee04160075..000cacbfac3a9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -135,8 +135,6 @@ Gif::Gif(
 , _storyId(realParent->media()
 	? realParent->media()->storyId()
 	: FullStoryId())
-, _caption(
-	st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right())
 , _spoiler((spoiler || IsHiddenRoundMessage(_parent))
 	? std::make_unique<MediaSpoiler>()
 	: nullptr)
@@ -184,7 +182,6 @@ Gif::Gif(
 		createSpoilerLink(_spoiler.get());
 	}
 
-	refreshCaption();
 	if ((_dataMedia = _data->activeMediaView())) {
 		dataMediaCreated();
 	} else {
@@ -240,13 +237,6 @@ QSize Gif::countThumbSize(int &inOutWidthMax) const {
 }
 
 QSize Gif::countOptimalSize() {
-	if (_parent->media() != this) {
-		_caption = Ui::Text::String();
-	} else if (_caption.hasSkipBlock()) {
-		_caption.updateSkipBlock(
-			_parent->skipBlockWidth(),
-			_parent->skipBlockHeight());
-	}
 	if (_data->isVideoMessage() && _transcribe) {
 		const auto &entry = _data->session().api().transcribes().entry(
 			_realParent);
@@ -271,21 +261,16 @@ QSize Gif::countOptimalSize() {
 		accumulate_max(maxWidth, gifMaxStatusWidth(_data) + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
 	}
 	if (_parent->hasBubble()) {
-		if (!_caption.isEmpty()) {
-			maxWidth = qMax(maxWidth, st::msgPadding.left()
-				+ _caption.maxWidth()
-				+ st::msgPadding.right());
-			minHeight = adjustHeightForLessCrop(
-				scaled,
-				{ maxWidth, minHeight });
-			if (const auto botTop = _parent->Get<FakeBotAboutTop>()) {
-				accumulate_max(maxWidth, botTop->maxWidth);
-				minHeight += botTop->height;
-			}
-			minHeight += st::mediaCaptionSkip + _caption.minHeight();
-			if (isBubbleBottom()) {
-				minHeight += st::msgPadding.bottom();
-			}
+		maxWidth = qMax(maxWidth, _parent->textualMaxWidth());
+		minHeight = adjustHeightForLessCrop(
+			scaled,
+			{ maxWidth, minHeight });
+		if (const auto botTop = _parent->Get<FakeBotAboutTop>()) {
+			accumulate_max(maxWidth, botTop->maxWidth);
+			minHeight += botTop->height;
+		}
+		if (isBubbleBottom()) {
+			minHeight += st::msgPadding.bottom();
 		}
 	} else if (isUnwrapped()) {
 		const auto item = _parent->data();
@@ -318,29 +303,18 @@ QSize Gif::countCurrentSize(int newWidth) {
 	}
 	if (_parent->hasBubble()) {
 		accumulate_max(newWidth, _parent->minWidthForMedia());
-		if (!_caption.isEmpty()) {
-			auto captionMaxWidth = st::msgPadding.left()
-				+ _caption.maxWidth()
-				+ st::msgPadding.right();
-			const auto botTop = _parent->Get<FakeBotAboutTop>();
-			if (botTop) {
-				accumulate_max(captionMaxWidth, botTop->maxWidth);
-			}
-			const auto maxWithCaption = qMin(st::msgMaxWidth, captionMaxWidth);
-			newWidth = qMin(qMax(newWidth, maxWithCaption), thumbMaxWidth);
-			newHeight = adjustHeightForLessCrop(
-				scaled,
-				{ newWidth, newHeight });
-			const auto captionw = newWidth
-				- st::msgPadding.left()
-				- st::msgPadding.right();
-			if (botTop) {
-				newHeight += botTop->height;
-			}
-			newHeight += st::mediaCaptionSkip + _caption.countHeight(captionw);
-			if (isBubbleBottom()) {
-				newHeight += st::msgPadding.bottom();
-			}
+		auto captionMaxWidth = _parent->textualMaxWidth();
+		const auto botTop = _parent->Get<FakeBotAboutTop>();
+		if (botTop) {
+			accumulate_max(captionMaxWidth, botTop->maxWidth);
+		}
+		const auto maxWithCaption = qMin(st::msgMaxWidth, captionMaxWidth);
+		newWidth = qMin(qMax(newWidth, maxWithCaption), thumbMaxWidth);
+		newHeight = adjustHeightForLessCrop(
+			scaled,
+			{ newWidth, newHeight });
+		if (botTop) {
+			newHeight += botTop->height;
 		}
 	} else if (isUnwrapped()) {
 		accumulate_max(newWidth, _parent->reactionsOptimalWidth());
@@ -433,7 +407,6 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 	const auto activeRoundPlaying = activeRoundStreamed();
 
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
-	auto captionw = paintw - st::msgPadding.left() - st::msgPadding.right();
 	const bool bubble = _parent->hasBubble();
 	const auto rightLayout = _parent->hasRightLayout();
 	const auto inWebPage = (_parent->media() != this);
@@ -442,16 +415,10 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 
 	const auto rounding = inWebPage
 		? std::optional<Ui::BubbleRounding>()
-		: adjustedBubbleRoundingWithCaption(_caption);
+		: adjustedBubbleRounding();
 	if (bubble) {
-		if (!_caption.isEmpty()) {
-			if (botTop) {
-				painth -= botTop->height;
-			}
-			painth -= st::mediaCaptionSkip + _caption.countHeight(captionw);
-			if (isBubbleBottom()) {
-				painth -= st::msgPadding.bottom();
-			}
+		if (botTop) {
+			painth -= botTop->height;
 		}
 	}
 
@@ -792,11 +759,13 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 			}
 		}
 	}
-	if (!unwrapped && !_caption.isEmpty()) {
+	if (!unwrapped && bubble) {
 		p.setPen(stm->historyTextFg);
-		_parent->prepareCustomEmojiPaint(p, context, _caption);
 		auto top = painty + painth + st::mediaCaptionSkip;
 		if (botTop) {
+			auto captionw = paintw
+				- st::msgPadding.left()
+				- st::msgPadding.right();
 			botTop->text.drawLeftElided(
 				p,
 				st::msgPadding.left(),
@@ -805,21 +774,6 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 				_parent->width());
 			top += botTop->height;
 		}
-		auto highlightRequest = context.computeHighlightCache();
-		_caption.draw(p, {
-			.position = QPoint(st::msgPadding.left(), top),
-			.availableWidth = captionw,
-			.palette = &stm->textPalette,
-			.pre = stm->preCache.get(),
-			.blockquote = context.quoteCache(parent()->contentColorIndex()),
-			.colors = context.st->highlightColors(),
-			.spoiler = Ui::Text::DefaultSpoilerCache(),
-			.now = context.now,
-			.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
-			.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
-			.selection = context.selection,
-			.highlight = highlightRequest ? &*highlightRequest : nullptr,
-		});
 	} else if (!inWebPage && !skipDrawingSurrounding) {
 		auto fullRight = paintx + usex + usew;
 		auto fullBottom = painty + painth;
@@ -1081,23 +1035,10 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	auto bubble = _parent->hasBubble();
 
-	if (bubble && !_caption.isEmpty()) {
-		auto captionw = paintw - st::msgPadding.left() - st::msgPadding.right();
-		painth -= _caption.countHeight(captionw);
-		if (isBubbleBottom()) {
-			painth -= st::msgPadding.bottom();
-		}
-		if (QRect(st::msgPadding.left(), painth, captionw, height() - painth).contains(point)) {
-			result = TextState(_parent, _caption.getState(
-				point - QPoint(st::msgPadding.left(), painth),
-				captionw,
-				request.forText()));
-			return result;
-		}
+	if (bubble) {
 		if (const auto botTop = _parent->Get<FakeBotAboutTop>()) {
 			painth -= botTop->height;
 		}
-		painth -= st::mediaCaptionSkip;
 	}
 	const auto rightLayout = _parent->hasRightLayout();
 	const auto inWebPage = (_parent->media() != this);
@@ -1212,7 +1153,7 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 			? _cancell
 			: _savel;
 	}
-	if (unwrapped || _caption.isEmpty()) {
+	if (unwrapped || !bubble) {
 		auto fullRight = usex + paintx + usew;
 		auto fullBottom = painty + painth;
 		auto maxRight = _parent->width() - st::msgMargin.left();
@@ -1289,23 +1230,11 @@ void Gif::clickHandlerPressedChanged(
 	}
 }
 
-TextForMimeData Gif::selectedText(TextSelection selection) const {
-	return _caption.toTextForMimeData(selection);
-}
-
-SelectedQuote Gif::selectedQuote(TextSelection selection) const {
-	return Element::FindSelectedQuote(_caption, selection, _realParent);
-}
-
-TextSelection Gif::selectionFromQuote(const SelectedQuote &quote) const {
-	return Element::FindSelectionFromQuote(_caption, quote);
-}
-
 bool Gif::fullFeaturedGrouped(RectParts sides) const {
 	return (sides & RectPart::Left) && (sides & RectPart::Right);
 }
 
-QSize Gif::sizeForGroupingOptimal(int maxWidth) const {
+QSize Gif::sizeForGroupingOptimal(int maxWidth, bool last) const {
 	return sizeForAspectRatio();
 }
 
@@ -1588,7 +1517,6 @@ bool Gif::uploading() const {
 }
 
 void Gif::hideSpoilers() {
-	_caption.setSpoilerRevealed(false, anim::type::instant);
 	if (_spoiler) {
 		_spoiler->revealed = false;
 	}
@@ -1599,13 +1527,12 @@ bool Gif::needsBubble() const {
 		return true;
 	} else if (_data->isVideoMessage()) {
 		return false;
-	} else if (!_caption.isEmpty()) {
-		return true;
 	}
 	const auto item = _parent->data();
 	return item->repliesAreComments()
 		|| item->externalReply()
 		|| item->viaBot()
+		|| !item->emptyText()
 		|| _parent->displayReply()
 		|| _parent->displayForwardedFrom()
 		|| _parent->displayFromName()
@@ -1810,13 +1737,6 @@ bool Gif::isReadyForOpen() const {
 	return true;
 }
 
-void Gif::parentTextUpdated() {
-	if (_parent->media() == this) {
-		refreshCaption();
-		history()->owner().requestViewResize(_parent);
-	}
-}
-
 bool Gif::hasHeavyPart() const {
 	return (_spoiler && _spoiler->animation) || _streamed || _dataMedia;
 }
@@ -1830,19 +1750,11 @@ void Gif::unloadHeavyPart() {
 	}
 	_thumbCache = QImage();
 	_videoThumbnailFrame = nullptr;
-	_caption.unloadPersistentAnimation();
 	togglePollingStory(false);
 }
 
-void Gif::refreshParentId(not_null<HistoryItem*> realParent) {
-	File::refreshParentId(realParent);
-	if (_parent->media() == this) {
-		refreshCaption();
-	}
-}
-
-void Gif::refreshCaption() {
-	_caption = createCaption(_parent->data());
+bool Gif::enforceBubbleWidth() const {
+	return true;
 }
 
 int Gif::additionalWidth(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h
index dad49b3518fb1..840b12587441c 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h
@@ -54,6 +54,10 @@ class Gif final : public File {
 		bool spoiler);
 	~Gif();
 
+	bool hideMessageText() const override {
+		return false;
+	}
+
 	void draw(Painter &p, const PaintContext &context) const override;
 	TextState textState(QPoint point, StateRequest request) const override;
 
@@ -61,23 +65,6 @@ class Gif final : public File {
 		const ClickHandlerPtr &p,
 		bool pressed) override;
 
-	[[nodiscard]] TextSelection adjustSelection(
-			TextSelection selection,
-			TextSelectType type) const override {
-		return _caption.adjustSelection(selection, type);
-	}
-	uint16 fullSelectionLength() const override {
-		return _caption.length();
-	}
-	bool hasTextForCopy() const override {
-		return !_caption.isEmpty();
-	}
-
-	TextForMimeData selectedText(TextSelection selection) const override;
-	SelectedQuote selectedQuote(TextSelection selection) const override;
-	TextSelection selectionFromQuote(
-		const SelectedQuote &quote) const override;
-
 	bool uploading() const override;
 
 	DocumentData *getDocument() const override {
@@ -85,7 +72,7 @@ class Gif final : public File {
 	}
 
 	bool fullFeaturedGrouped(RectParts sides) const;
-	QSize sizeForGroupingOptimal(int maxWidth) const override;
+	QSize sizeForGroupingOptimal(int maxWidth, bool last) const override;
 	QSize sizeForGrouping(int width) const override;
 	void drawGrouped(
 		Painter &p,
@@ -105,14 +92,11 @@ class Gif final : public File {
 	void stopAnimation() override;
 	void checkAnimation() override;
 
-	TextWithEntities getCaption() const override {
-		return _caption.toTextWithEntities();
-	}
 	void hideSpoilers() override;
 	bool needsBubble() const override;
 	bool unwrapped() const override;
 	bool customInfoLayout() const override {
-		return _caption.isEmpty();
+		return true;
 	}
 	QRect contentRectForReactions() const override;
 	std::optional<int> reactionButtonCenterOverride() const override;
@@ -120,16 +104,13 @@ class Gif final : public File {
 	QString additionalInfoString() const override;
 
 	bool skipBubbleTail() const override {
-		return isRoundedInBubbleBottom() && _caption.isEmpty();
+		return isRoundedInBubbleBottom();
 	}
 	bool isReadyForOpen() const override;
 
-	void parentTextUpdated() override;
-
 	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
-
-	void refreshParentId(not_null<HistoryItem*> realParent) override;
+	bool enforceBubbleWidth() const override;
 
 	[[nodiscard]] static bool CanPlayInline(not_null<DocumentData*> document);
 
@@ -148,7 +129,6 @@ class Gif final : public File {
 
 	void ensureDataMediaCreated() const;
 	void dataMediaCreated() const;
-	void refreshCaption();
 
 	[[nodiscard]] bool autoplayEnabled() const;
 
@@ -223,7 +203,6 @@ class Gif final : public File {
 
 	const not_null<DocumentData*> _data;
 	const FullStoryId _storyId;
-	Ui::Text::String _caption;
 	std::unique_ptr<Streamed> _streamed;
 	const std::unique_ptr<MediaSpoiler> _spoiler;
 	mutable std::unique_ptr<TranscribeButton> _transcribe;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_invoice.h b/Telegram/SourceFiles/history/view/media/history_view_invoice.h
index a95c7d5dc36af..b9f5203ab8218 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_invoice.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_invoice.h
@@ -30,6 +30,9 @@ class Invoice : public Media {
 		return _title.toString();
 	}
 
+	bool aboveTextByDefault() const override {
+		return false;
+	}
 	bool hideMessageText() const override {
 		return false;
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index 56720e83f8a77..65c2091537717 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -391,10 +391,8 @@ Ui::BubbleRounding Media::adjustedBubbleRounding(RectParts square) const {
 	return result;
 }
 
-Ui::BubbleRounding Media::adjustedBubbleRoundingWithCaption(
-		const Ui::Text::String &caption) const {
-	return adjustedBubbleRounding(
-		caption.isEmpty() ? RectParts() : RectPart::FullBottom);
+HistoryItem *Media::itemForText() const {
+	return _parent->data();
 }
 
 bool Media::isRoundedInBubbleBottom() const {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h
index f9ad5c987d456..4926ca7c8bc85 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.h
@@ -104,6 +104,10 @@ class Media : public Object, public base::has_weak_ptr {
 	[[nodiscard]] virtual bool hasTextForCopy() const {
 		return false;
 	}
+	[[nodiscard]] virtual bool aboveTextByDefault() const {
+		return true;
+	}
+	[[nodiscard]] virtual HistoryItem *itemForText() const;
 	[[nodiscard]] virtual bool hideMessageText() const {
 		return true;
 	}
@@ -194,7 +198,9 @@ class Media : public Object, public base::has_weak_ptr {
 	virtual void checkAnimation() {
 	}
 
-	[[nodiscard]] virtual QSize sizeForGroupingOptimal(int maxWidth) const {
+	[[nodiscard]] virtual QSize sizeForGroupingOptimal(
+			int maxWidth,
+			bool last) const {
 		Unexpected("Grouping method call.");
 	}
 	[[nodiscard]] virtual QSize sizeForGrouping(int width) const {
@@ -221,9 +227,6 @@ class Media : public Object, public base::has_weak_ptr {
 		return false;
 	}
 
-	[[nodiscard]] virtual TextWithEntities getCaption() const {
-		return TextWithEntities();
-	}
 	virtual void hideSpoilers() {
 	}
 	[[nodiscard]] virtual bool needsBubble() const = 0;
@@ -273,8 +276,6 @@ class Media : public Object, public base::has_weak_ptr {
 	}
 	[[nodiscard]] Ui::BubbleRounding adjustedBubbleRounding(
 		RectParts square = {}) const;
-	[[nodiscard]] Ui::BubbleRounding adjustedBubbleRoundingWithCaption(
-		const Ui::Text::String &caption) const;
 	[[nodiscard]] bool isBubbleTop() const {
 		return (_inBubbleState == MediaInBubbleState::Top)
 			|| (_inBubbleState == MediaInBubbleState::None);
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 038192cf15ee1..7d11579e9deba 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -65,8 +65,7 @@ GroupedMedia::Part::Part(
 GroupedMedia::GroupedMedia(
 	not_null<Element*> parent,
 	const std::vector<std::unique_ptr<Data::Media>> &medias)
-: Media(parent)
-, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
+: Media(parent) {
 	const auto truncated = ranges::views::all(
 		medias
 	) | ranges::views::transform([](const std::unique_ptr<Data::Media> &v) {
@@ -80,8 +79,7 @@ GroupedMedia::GroupedMedia(
 GroupedMedia::GroupedMedia(
 	not_null<Element*> parent,
 	const std::vector<not_null<HistoryItem*>> &items)
-: Media(parent)
-, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
+: Media(parent) {
 	const auto medias = ranges::views::all(
 		items
 	) | ranges::views::transform([](not_null<HistoryItem*> item) {
@@ -97,6 +95,31 @@ GroupedMedia::~GroupedMedia() {
 	base::take(_parts);
 }
 
+HistoryItem *GroupedMedia::itemForText() const {
+	if (_mode == Mode::Column) {
+		return Media::itemForText();
+	} else if (!_captionItem) {
+		_captionItem = [&]() -> HistoryItem* {
+			auto result = (HistoryItem*)nullptr;
+			for (const auto &part : _parts) {
+				if (!part.item->emptyText()) {
+					if (result) {
+						return nullptr;
+					} else {
+						result = part.item;
+					}
+				}
+			}
+			return result;
+		}();
+	}
+	return *_captionItem;
+}
+
+bool GroupedMedia::hideMessageText() const {
+	return (_mode == Mode::Column);
+}
+
 GroupedMedia::Mode GroupedMedia::DetectMode(not_null<Data::Media*> media) {
 	const auto document = media->document();
 	return (document && !document->isVideoFile())
@@ -105,12 +128,6 @@ GroupedMedia::Mode GroupedMedia::DetectMode(not_null<Data::Media*> media) {
 }
 
 QSize GroupedMedia::countOptimalSize() {
-	if (_caption.hasSkipBlock()) {
-		_caption.updateSkipBlock(
-			_parent->skipBlockWidth(),
-			_parent->skipBlockHeight());
-	}
-
 	std::vector<QSize> sizes;
 	const auto partsCount = _parts.size();
 	sizes.reserve(partsCount);
@@ -123,8 +140,11 @@ QSize GroupedMedia::countOptimalSize() {
 			accumulate_max(maxWidth, media->maxWidth());
 		}
 	}
+	auto index = 0;
 	for (const auto &part : _parts) {
-		sizes.push_back(part.content->sizeForGroupingOptimal(maxWidth));
+		const auto last = (++index == _parts.size());
+		sizes.push_back(
+			part.content->sizeForGroupingOptimal(maxWidth, last));
 	}
 
 	const auto layout = (_mode == Mode::Grid)
@@ -145,13 +165,7 @@ QSize GroupedMedia::countOptimalSize() {
 		_parts[i].sides = item.sides;
 	}
 
-	if (!_caption.isEmpty()) {
-		auto captionw = maxWidth - st::msgPadding.left() - st::msgPadding.right();
-		minHeight += st::mediaCaptionSkip + _caption.countHeight(captionw);
-		if (isBubbleBottom()) {
-			minHeight += st::msgPadding.bottom();
-		}
-	} else if (_mode == Mode::Column && _parts.back().item->emptyText()) {
+	if (_mode == Mode::Column && _parts.back().item->emptyText()) {
 		const auto item = _parent->data();
 		const auto msgsigned = item->Get<HistoryMessageSigned>();
 		const auto views = item->Get<HistoryMessageViews>();
@@ -215,13 +229,7 @@ QSize GroupedMedia::countCurrentSize(int newWidth) {
 			accumulate_max(newHeight, top + height);
 		}
 	}
-	if (!_caption.isEmpty()) {
-		const auto captionw = newWidth - st::msgPadding.left() - st::msgPadding.right();
-		newHeight += st::mediaCaptionSkip + _caption.countHeight(captionw);
-		if (isBubbleBottom()) {
-			newHeight += st::msgPadding.bottom();
-		}
-	} else if (_mode == Mode::Column && _parts.back().item->emptyText()) {
+	if (_mode == Mode::Column && _parts.back().item->emptyText()) {
 		const auto item = _parent->data();
 		const auto msgsigned = item->Get<HistoryMessageSigned>();
 		const auto views = item->Get<HistoryMessageViews>();
@@ -341,7 +349,7 @@ void GroupedMedia::draw(Painter &p, const PaintContext &context) const {
 	constexpr auto kSmall = Ui::BubbleCornerRounding::Small;
 	const auto rounding = inWebPage
 		? Ui::BubbleRounding{ kSmall, kSmall, kSmall, kSmall }
-		: adjustedBubbleRoundingWithCaption(_caption);
+		: adjustedBubbleRounding();
 	auto highlight = context.highlight.range;
 	const auto subpartHighlight = IsSubGroupSelection(highlight);
 	for (auto i = 0, count = int(_parts.size()); i != count; ++i) {
@@ -388,33 +396,7 @@ void GroupedMedia::draw(Painter &p, const PaintContext &context) const {
 	}
 
 	// date
-	if (!_caption.isEmpty()) {
-		const auto captionw = width() - st::msgPadding.left() - st::msgPadding.right();
-		const auto captiony = height()
-			- groupPadding.bottom()
-			- (isBubbleBottom() ? st::msgPadding.bottom() : 0)
-			- _caption.countHeight(captionw);
-		const auto stm = context.messageStyle();
-		p.setPen(stm->historyTextFg);
-		_parent->prepareCustomEmojiPaint(p, context, _caption);
-		auto highlightRequest = context.computeHighlightCache();
-		_caption.draw(p, {
-			.position = QPoint(
-				st::msgPadding.left(),
-				captiony),
-			.availableWidth = captionw,
-			.palette = &stm->textPalette,
-			.pre = stm->preCache.get(),
-			.blockquote = context.quoteCache(parent()->contentColorIndex()),
-			.colors = context.st->highlightColors(),
-			.spoiler = Ui::Text::DefaultSpoilerCache(),
-			.now = context.now,
-			.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
-			.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
-			.selection = context.selection,
-			.highlight = highlightRequest ? &*highlightRequest : nullptr,
-		});
-	} else if (_parent->media() == this) {
+	if (_parent->media() == this) {
 		auto fullRight = width();
 		auto fullBottom = height();
 		if (needInfoDisplay()) {
@@ -473,23 +455,7 @@ PointState GroupedMedia::pointState(QPoint point) const {
 TextState GroupedMedia::textState(QPoint point, StateRequest request) const {
 	const auto groupPadding = groupedPadding();
 	auto result = getPartState(point - QPoint(0, groupPadding.top()), request);
-	if (!result.link && !_caption.isEmpty()) {
-		const auto captionw = width() - st::msgPadding.left() - st::msgPadding.right();
-		const auto captiony = height()
-			- groupPadding.bottom()
-			- (isBubbleBottom() ? st::msgPadding.bottom() : 0)
-			- _caption.countHeight(captionw);
-		if (QRect(st::msgPadding.left(), captiony, captionw, height() - captiony).contains(point)) {
-			return TextState(
-				_captionItem
-					? _captionItem
-					: _parent->data().get(),
-				_caption.getState(
-					point - QPoint(st::msgPadding.left(), captiony),
-					captionw,
-					request.forText()));
-		}
-	} else if (_parent->media() == this) {
+	if (_parent->media() == this) {
 		auto fullRight = width();
 		auto fullBottom = height();
 		const auto bottomInfoResult = _parent->bottomInfoTextState(
@@ -539,7 +505,7 @@ TextSelection GroupedMedia::adjustSelection(
 		TextSelection selection,
 		TextSelectType type) const {
 	if (_mode != Mode::Column) {
-		return _caption.adjustSelection(selection, type);
+		return {};
 	}
 	auto checked = 0;
 	for (const auto &part : _parts) {
@@ -563,7 +529,7 @@ TextSelection GroupedMedia::adjustSelection(
 
 uint16 GroupedMedia::fullSelectionLength() const {
 	if (_mode != Mode::Column) {
-		return _caption.length();
+		return {};
 	}
 	auto result = 0;
 	for (const auto &part : _parts) {
@@ -574,7 +540,7 @@ uint16 GroupedMedia::fullSelectionLength() const {
 
 bool GroupedMedia::hasTextForCopy() const {
 	if (_mode != Mode::Column) {
-		return !_caption.isEmpty();
+		return {};
 	}
 	for (const auto &part : _parts) {
 		if (part.content->hasTextForCopy()) {
@@ -587,7 +553,7 @@ bool GroupedMedia::hasTextForCopy() const {
 TextForMimeData GroupedMedia::selectedText(
 		TextSelection selection) const {
 	if (_mode != Mode::Column) {
-		return _caption.toTextForMimeData(selection);
+		return {};
 	}
 	auto result = TextForMimeData();
 	for (const auto &part : _parts) {
@@ -606,9 +572,7 @@ TextForMimeData GroupedMedia::selectedText(
 
 SelectedQuote GroupedMedia::selectedQuote(TextSelection selection) const {
 	if (_mode != Mode::Column) {
-		return _captionItem
-			? Element::FindSelectedQuote(_caption, selection, _captionItem)
-			: SelectedQuote();
+		return {};
 	}
 	for (const auto &part : _parts) {
 		const auto next = part.content->skipSelection(selection);
@@ -630,9 +594,7 @@ TextSelection GroupedMedia::selectionFromQuote(
 	Expects(quote.item != nullptr);
 
 	if (_mode != Mode::Column) {
-		return (_captionItem == quote.item)
-			? Element::FindSelectionFromQuote(_caption, quote)
-			: TextSelection();
+		return {};
 	}
 	const auto i = ranges::find(_parts, not_null(quote.item), &Part::item);
 	if (i == end(_parts)) {
@@ -730,7 +692,6 @@ bool GroupedMedia::applyGroup(const DataMediaRange &medias) {
 	if (_parts.empty()) {
 		return false;
 	}
-	refreshCaption();
 
 	Ensures(_parts.size() <= kMaxSize);
 	return true;
@@ -750,43 +711,13 @@ bool GroupedMedia::validateGroupParts(
 	return (i == count);
 }
 
-void GroupedMedia::refreshCaption() {
-	const auto part = [&]() -> const Part* {
-		if (_mode == Mode::Column) {
-			return nullptr;
-		}
-		auto result = (const Part*)nullptr;
-		for (const auto &part : _parts) {
-			if (!part.item->emptyText()) {
-				if (result) {
-					return nullptr;
-				} else {
-					result = &part;
-				}
-			}
-		}
-		return result;
-	}();
-	if (part) {
-		_caption = createCaption(part->item);
-		_captionItem = part->item;
-	} else {
-		_captionItem = nullptr;
-	}
-}
-
 not_null<Media*> GroupedMedia::main() const {
 	Expects(!_parts.empty());
 
 	return _parts.back().content.get();
 }
 
-TextWithEntities GroupedMedia::getCaption() const {
-	return main()->getCaption();
-}
-
 void GroupedMedia::hideSpoilers() {
-	_caption.setSpoilerRevealed(false, anim::type::instant);
 	for (const auto &part : _parts) {
 		part.content->hideSpoilers();
 	}
@@ -846,13 +777,11 @@ void GroupedMedia::unloadHeavyPart() {
 		part.cacheKey = 0;
 		part.cache = QPixmap();
 	}
-	_caption.unloadPersistentAnimation();
 }
 
 void GroupedMedia::parentTextUpdated() {
 	if (_parent->media() == this) {
-		refreshCaption();
-		history()->owner().requestViewResize(_parent);
+		_captionItem = std::nullopt;
 	}
 }
 
@@ -867,7 +796,9 @@ QPoint GroupedMedia::resolveCustomInfoRightBottom() const {
 }
 
 bool GroupedMedia::computeNeedBubble() const {
-	if (!_caption.isEmpty() || _mode == Mode::Column) {
+	Expects(_mode == Mode::Column || _captionItem.has_value());
+
+	if (_mode == Mode::Column || *_captionItem) {
 		return true;
 	}
 	if (const auto item = _parent->data()) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
index f8baabe8a5729..5637f65ad9798 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
@@ -31,6 +31,9 @@ class GroupedMedia : public Media {
 
 	void refreshParentId(not_null<HistoryItem*> realParent) override;
 
+	HistoryItem *itemForText() const override;
+	bool hideMessageText() const override;
+
 	void drawHighlight(
 		Painter &p,
 		const PaintContext &context,
@@ -69,7 +72,6 @@ class GroupedMedia : public Media {
 		const ClickHandlerPtr &p,
 		bool pressed) override;
 
-	TextWithEntities getCaption() const override;
 	void hideSpoilers() override;
 	Storage::SharedMediaTypesMask sharedMediaTypes() const override;
 
@@ -79,14 +81,12 @@ class GroupedMedia : public Media {
 	HistoryMessageEdited *displayedEditBadge() const override;
 
 	bool skipBubbleTail() const override {
-		return (_mode == Mode::Grid)
-			&& isRoundedInBubbleBottom()
-			&& _caption.isEmpty();
+		return (_mode == Mode::Grid) && isRoundedInBubbleBottom();
 	}
 	void updateNeedBubbleState() override;
 	bool needsBubble() const override;
 	bool customInfoLayout() const override {
-		return _caption.isEmpty() && (_mode != Mode::Column);
+		return (_mode != Mode::Column);
 	}
 	QPoint resolveCustomInfoRightBottom() const override;
 
@@ -143,15 +143,12 @@ class GroupedMedia : public Media {
 		QPoint point,
 		StateRequest request) const;
 
-	void refreshCaption();
-
 	[[nodiscard]] Ui::BubbleRounding applyRoundingSides(
 		Ui::BubbleRounding already,
 		RectParts sides) const;
 	[[nodiscard]] QMargins groupedPadding() const;
 
-	Ui::Text::String _caption;
-	HistoryItem *_captionItem = nullptr;
+	mutable std::optional<HistoryItem*> _captionItem;
 	std::vector<Part> _parts;
 	Mode _mode = Mode::Grid;
 	bool _needBubble = false;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 2532509a7b3b8..869527eceb94e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -73,9 +73,7 @@ Photo::Photo(
 , _storyId(realParent->media()
 	? realParent->media()->storyId()
 	: FullStoryId())
-, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right())
 , _spoiler(spoiler ? std::make_unique<MediaSpoiler>() : nullptr) {
-	_caption = createCaption(realParent);
 	create(realParent->fullId());
 }
 
@@ -161,7 +159,6 @@ void Photo::unloadHeavyPart() {
 		_spoiler->animation = nullptr;
 	}
 	_imageCache = QImage();
-	_caption.unloadPersistentAnimation();
 	togglePollingStory(false);
 }
 
@@ -184,15 +181,6 @@ QSize Photo::countOptimalSize() {
 	if (_serviceWidth > 0) {
 		return { int(_serviceWidth), int(_serviceWidth) };
 	}
-
-	if (_parent->media() != this) {
-		_caption = Ui::Text::String();
-	} else if (_caption.hasSkipBlock()) {
-		_caption.updateSkipBlock(
-			_parent->skipBlockWidth(),
-			_parent->skipBlockHeight());
-	}
-
 	const auto dimensions = photoSize();
 	const auto scaled = CountDesiredMediaSize(dimensions);
 	const auto minWidth = std::clamp(
@@ -204,12 +192,7 @@ QSize Photo::countOptimalSize() {
 	const auto maxActualWidth = qMax(scaled.width(), minWidth);
 	auto maxWidth = qMax(maxActualWidth, scaled.height());
 	auto minHeight = qMax(scaled.height(), st::minPhotoSize);
-	if (_parent->hasBubble() && !_caption.isEmpty()) {
-		maxWidth = qMax(
-			maxWidth,
-			(st::msgPadding.left()
-				+ _caption.maxWidth()
-				+ st::msgPadding.right()));
+	if (_parent->hasBubble()) {
 		minHeight = adjustHeightForLessCrop(
 			dimensions,
 			{ maxWidth, minHeight });
@@ -217,10 +200,6 @@ QSize Photo::countOptimalSize() {
 			accumulate_max(maxWidth, botTop->maxWidth);
 			minHeight += botTop->height;
 		}
-		minHeight += st::mediaCaptionSkip + _caption.minHeight();
-		if (isBubbleBottom()) {
-			minHeight += st::msgPadding.bottom();
-		}
 	}
 	return { maxWidth, minHeight };
 }
@@ -244,10 +223,8 @@ QSize Photo::countCurrentSize(int newWidth) {
 	newWidth = qMax(pix.width(), minWidth);
 	auto newHeight = qMax(pix.height(), st::minPhotoSize);
 	auto imageHeight = newHeight;
-	if (_parent->hasBubble() && !_caption.isEmpty()) {
-		auto captionMaxWidth = st::msgPadding.left()
-			+ _caption.maxWidth()
-			+ st::msgPadding.right();
+	if (_parent->hasBubble()) {
+		auto captionMaxWidth = _parent->textualMaxWidth();
 		const auto botTop = _parent->Get<FakeBotAboutTop>();
 		if (botTop) {
 			accumulate_max(captionMaxWidth, botTop->maxWidth);
@@ -257,16 +234,9 @@ QSize Photo::countCurrentSize(int newWidth) {
 		imageHeight = newHeight = adjustHeightForLessCrop(
 			dimensions,
 			{ newWidth, newHeight });
-		const auto captionw = newWidth
-			- st::msgPadding.left()
-			- st::msgPadding.right();
 		if (botTop) {
 			newHeight += botTop->height;
 		}
-		newHeight += st::mediaCaptionSkip + _caption.countHeight(captionw);
-		if (isBubbleBottom()) {
-			newHeight += st::msgPadding.bottom();
-		}
 	}
 	const auto enlargeInner = st::historyPageEnlargeSize;
 	const auto enlargeOuter = 2 * st::historyPageEnlargeSkip + enlargeInner;
@@ -309,8 +279,6 @@ void Photo::draw(Painter &p, const PaintContext &context) const {
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	auto bubble = _parent->hasBubble();
 
-	auto captionw = paintw - st::msgPadding.left() - st::msgPadding.right();
-
 	if (displayLoading) {
 		ensureAnimation();
 		if (!_animation->radial.animating()) {
@@ -326,19 +294,8 @@ void Photo::draw(Painter &p, const PaintContext &context) const {
 	} else {
 		const auto rounding = inWebPage
 			? std::optional<Ui::BubbleRounding>()
-			: adjustedBubbleRoundingWithCaption(_caption);
-		if (bubble) {
-			if (!_caption.isEmpty()) {
-				painth -= st::mediaCaptionSkip + _caption.countHeight(captionw);
-				if (botTop) {
-					painth -= botTop->height;
-				}
-				if (isBubbleBottom()) {
-					painth -= st::msgPadding.bottom();
-				}
-				rthumb = style::rtlrect(paintx, painty, paintw, painth, width());
-			}
-		} else {
+			: adjustedBubbleRounding();
+		if (!bubble) {
 			Assert(rounding.has_value());
 			fillImageShadow(p, rthumb, *rounding, context);
 		}
@@ -414,35 +371,7 @@ void Photo::draw(Painter &p, const PaintContext &context) const {
 	}
 
 	// date
-	if (!_caption.isEmpty()) {
-		p.setPen(stm->historyTextFg);
-		_parent->prepareCustomEmojiPaint(p, context, _caption);
-		auto top = painty + painth + st::mediaCaptionSkip;
-		if (botTop) {
-			botTop->text.drawLeftElided(
-				p,
-				st::msgPadding.left(),
-				top,
-				captionw,
-				_parent->width());
-			top += botTop->height;
-		}
-		auto highlightRequest = context.computeHighlightCache();
-		_caption.draw(p, {
-			.position = QPoint(st::msgPadding.left(), top),
-			.availableWidth = captionw,
-			.palette = &stm->textPalette,
-			.pre = stm->preCache.get(),
-			.blockquote = context.quoteCache(parent()->contentColorIndex()),
-			.colors = context.st->highlightColors(),
-			.spoiler = Ui::Text::DefaultSpoilerCache(),
-			.now = context.now,
-			.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
-			.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
-			.selection = context.selection,
-			.highlight = highlightRequest ? &*highlightRequest : nullptr,
-		});
-	} else if (!inWebPage) {
+	if (isBubbleBottom() && !inWebPage) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = painty + painth;
 		if (needInfoDisplay()) {
@@ -682,21 +611,7 @@ TextState Photo::textState(QPoint point, StateRequest request) const {
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	auto bubble = _parent->hasBubble();
 
-	if (bubble && !_caption.isEmpty()) {
-		const auto captionw = paintw
-			- st::msgPadding.left()
-			- st::msgPadding.right();
-		painth -= _caption.countHeight(captionw);
-		if (isBubbleBottom()) {
-			painth -= st::msgPadding.bottom();
-		}
-		if (QRect(st::msgPadding.left(), painth, captionw, height() - painth).contains(point)) {
-			result = TextState(_parent, _caption.getState(
-				point - QPoint(st::msgPadding.left(), painth),
-				captionw,
-				request.forText()));
-			return result;
-		}
+	if (bubble) {
 		if (const auto botTop = _parent->Get<FakeBotAboutTop>()) {
 			painth -= botTop->height;
 		}
@@ -719,7 +634,7 @@ TextState Photo::textState(QPoint point, StateRequest request) const {
 			result.cursor = CursorState::Enlarge;
 		}
 	}
-	if (_caption.isEmpty() && _parent->media() == this) {
+	if (isBubbleBottom() && _parent->media() == this) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = painty + painth;
 		const auto bottomInfoResult = _parent->bottomInfoTextState(
@@ -746,13 +661,13 @@ TextState Photo::textState(QPoint point, StateRequest request) const {
 	return result;
 }
 
-QSize Photo::sizeForGroupingOptimal(int maxWidth) const {
+QSize Photo::sizeForGroupingOptimal(int maxWidth, bool last) const {
 	const auto size = photoSize();
 	return { std::max(size.width(), 1), std::max(size.height(), 1)};
 }
 
 QSize Photo::sizeForGrouping(int width) const {
-	return sizeForGroupingOptimal(width);
+	return sizeForGroupingOptimal(width, false);
 }
 
 void Photo::drawGrouped(
@@ -1094,27 +1009,14 @@ bool Photo::videoAutoplayEnabled() const {
 		_data);
 }
 
-TextForMimeData Photo::selectedText(TextSelection selection) const {
-	return _caption.toTextForMimeData(selection);
-}
-
-SelectedQuote Photo::selectedQuote(TextSelection selection) const {
-	return Element::FindSelectedQuote(_caption, selection, _realParent);
-}
-
-TextSelection Photo::selectionFromQuote(const SelectedQuote &quote) const {
-	return Element::FindSelectionFromQuote(_caption, quote);
-}
-
 void Photo::hideSpoilers() {
-	_caption.setSpoilerRevealed(false, anim::type::instant);
 	if (_spoiler) {
 		_spoiler->revealed = false;
 	}
 }
 
 bool Photo::needsBubble() const {
-	if (_storyId || !_caption.isEmpty()) {
+	if (_storyId) {
 		return true;
 	}
 	const auto item = _parent->data();
@@ -1122,6 +1024,7 @@ bool Photo::needsBubble() const {
 		&& (item->repliesAreComments()
 			|| item->externalReply()
 			|| item->viaBot()
+			|| !item->emptyText()
 			|| _parent->displayReply()
 			|| _parent->displayForwardedFrom()
 			|| _parent->displayFromName()
@@ -1139,13 +1042,6 @@ bool Photo::isReadyForOpen() const {
 	return _dataMedia->loaded();
 }
 
-void Photo::parentTextUpdated() {
-	_caption = (_parent->media() == this)
-		? createCaption(_parent->data())
-		: Ui::Text::String();
-	history()->owner().requestViewResize(_parent);
-}
-
 void Photo::showPhoto(FullMsgId id) {
 	_parent->delegate()->elementOpenPhoto(_data, id);
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.h b/Telegram/SourceFiles/history/view/media/history_view_photo.h
index 1c99839cedbe0..8b50f52ac1d3b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.h
@@ -41,25 +41,12 @@ class Photo final : public File {
 		int width);
 	~Photo();
 
-	void draw(Painter &p, const PaintContext &context) const override;
-	TextState textState(QPoint point, StateRequest request) const override;
-
-	[[nodiscard]] TextSelection adjustSelection(
-			TextSelection selection,
-			TextSelectType type) const override {
-		return _caption.adjustSelection(selection, type);
-	}
-	uint16 fullSelectionLength() const override {
-		return _caption.length();
-	}
-	bool hasTextForCopy() const override {
-		return !_caption.isEmpty();
+	bool hideMessageText() const override {
+		return false;
 	}
 
-	TextForMimeData selectedText(TextSelection selection) const override;
-	SelectedQuote selectedQuote(TextSelection selection) const override;
-	TextSelection selectionFromQuote(
-		const SelectedQuote &quote) const override;
+	void draw(Painter &p, const PaintContext &context) const override;
+	TextState textState(QPoint point, StateRequest request) const override;
 
 	PhotoData *getPhoto() const override {
 		return _data;
@@ -71,7 +58,7 @@ class Photo final : public File {
 		QPoint photoPosition,
 		bool markFrameShown) const;
 
-	QSize sizeForGroupingOptimal(int maxWidth) const override;
+	QSize sizeForGroupingOptimal(int maxWidth, bool last) const override;
 	QSize sizeForGrouping(int width) const override;
 	void drawGrouped(
 		Painter &p,
@@ -88,22 +75,17 @@ class Photo final : public File {
 		QPoint point,
 		StateRequest request) const override;
 
-	TextWithEntities getCaption() const override {
-		return _caption.toTextWithEntities();
-	}
 	void hideSpoilers() override;
 	bool needsBubble() const override;
 	bool customInfoLayout() const override {
-		return _caption.isEmpty();
+		return true;
 	}
 	QPoint resolveCustomInfoRightBottom() const override;
 	bool skipBubbleTail() const override {
-		return isRoundedInBubbleBottom() && _caption.isEmpty();
+		return isRoundedInBubbleBottom();
 	}
 	bool isReadyForOpen() const override;
 
-	void parentTextUpdated() override;
-
 	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
@@ -168,7 +150,6 @@ class Photo final : public File {
 
 	const not_null<PhotoData*> _data;
 	const FullStoryId _storyId;
-	Ui::Text::String _caption;
 	mutable std::shared_ptr<Data::PhotoMedia> _dataMedia;
 	mutable std::unique_ptr<Streamed> _streamed;
 	const std::unique_ptr<MediaSpoiler> _spoiler;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
index 454af2bbf7fbe..31bc076b05e85 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -35,6 +35,9 @@ class WebPage : public Media {
 	void draw(Painter &p, const PaintContext &context) const override;
 	TextState textState(QPoint point, StateRequest request) const override;
 
+	bool aboveTextByDefault() const override {
+		return false;
+	}
 	bool hideMessageText() const override {
 		return false;
 	}

From 67f781608870c894731e758765cf0a3b3d4776c7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 21:27:07 +0400
Subject: [PATCH 282/400] Allow sending photo/video captions above media.

---
 Telegram/Resources/langs/lang.strings         |   2 +
 Telegram/SourceFiles/api/api_common.h         |   1 +
 Telegram/SourceFiles/api/api_editing.cpp      |   3 +-
 Telegram/SourceFiles/api/api_sending.cpp      |  11 ++
 Telegram/SourceFiles/apiwrap.cpp              |   9 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp | 103 ++++++++++++------
 Telegram/SourceFiles/boxes/send_files_box.h   |  15 ++-
 .../chat_helpers/chat_helpers.style           |   4 +
 .../data/data_message_reactions.cpp           |   1 +
 .../media/stories/media_stories_share.cpp     |   3 +
 .../SourceFiles/media/view/media_view.style   |   2 +
 Telegram/SourceFiles/menu/menu_send.cpp       |  36 +++++-
 Telegram/SourceFiles/menu/menu_send.h         |  24 +++-
 .../ui/chat/attach/attach_prepare.cpp         |  11 ++
 .../ui/chat/attach/attach_prepare.h           |   3 +
 15 files changed, 182 insertions(+), 46 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9d6823fb59276..4d17985018d61 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -251,6 +251,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_caption_limit2#other" = "Make the caption shorter or subscribe to **Telegram Premium** to double the limit to **{count}** characters.";
 "lng_caption_limit_reached#one" = "You've reached the media caption limit. Please make the caption shorter by {count} character.";
 "lng_caption_limit_reached#other" = "You've reached the media caption limit. Please make the caption shorter by {count} characters.";
+"lng_caption_move_up" = "Move Caption Up";
+"lng_caption_move_down" = "Move Caption Down";
 
 "lng_file_size_limit_title" = "File Too Large";
 "lng_file_size_limit#one" = "{count} Gb";
diff --git a/Telegram/SourceFiles/api/api_common.h b/Telegram/SourceFiles/api/api_common.h
index 9c3939bf56b9e..efd92a9bcb443 100644
--- a/Telegram/SourceFiles/api/api_common.h
+++ b/Telegram/SourceFiles/api/api_common.h
@@ -26,6 +26,7 @@ struct SendOptions {
 	EffectId effectId = 0;
 	bool silent = false;
 	bool handleSupportSwitch = false;
+	bool invertCaption = false;
 	bool hideViaBot = false;
 	crl::time ttlSeconds = 0;
 };
diff --git a/Telegram/SourceFiles/api/api_editing.cpp b/Telegram/SourceFiles/api/api_editing.cpp
index 7dcd768cb4ff5..60dfb4c69d7fc 100644
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -81,7 +81,8 @@ mtpRequestId EditMessage(
 	| ((!webpage.removed && !webpage.url.isEmpty())
 		? MTPmessages_EditMessage::Flag::f_media
 		: emptyFlag)
-	| ((!webpage.removed && !webpage.url.isEmpty() && webpage.invert)
+	| (((!webpage.removed && !webpage.url.isEmpty() && webpage.invert)
+		|| options.invertCaption)
 		? MTPmessages_EditMessage::Flag::f_invert_media
 		: emptyFlag)
 	| (!sentEntities.v.isEmpty()
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index cbe617b750b60..8ab3d8bc7b762 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -136,6 +136,10 @@ void SendExistingMedia(
 	if (action.options.effectId) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
 	}
+	if (action.options.invertCaption) {
+		flags |= MessageFlag::InvertMedia;
+		sendFlags |= MTPmessages_SendMedia::Flag::f_invert_media;
+	}
 
 	session->data().registerMessageRandomId(randomId, newId);
 
@@ -314,6 +318,10 @@ bool SendDice(MessageToSend &message) {
 	if (action.options.effectId) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
 	}
+	if (action.options.invertCaption) {
+		flags |= MessageFlag::InvertMedia;
+		sendFlags |= MTPmessages_SendMedia::Flag::f_invert_media;
+	}
 
 	session->data().registerMessageRandomId(randomId, newId);
 
@@ -440,6 +448,9 @@ void SendConfirmedFile(
 			flags |= MessageFlag::MediaIsUnread;
 		}
 	}
+	if (file->to.options.invertCaption) {
+		flags |= MessageFlag::InvertMedia;
+	}
 
 	const auto messageFromId = file->to.options.sendAs
 		? file->to.options.sendAs->id
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 0e96bcec10db1..181cf26fb5053 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3772,7 +3772,8 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 		const auto anonymousPost = peer->amAnonymous();
 		const auto silentPost = ShouldSendSilent(peer, action.options);
 		FillMessagePostFlags(action, peer, flags);
-		if (exactWebPage && !ignoreWebPage && message.webPage.invert) {
+		if ((exactWebPage && !ignoreWebPage && message.webPage.invert)
+			|| action.options.invertCaption) {
 			flags |= MessageFlag::InvertMedia;
 			sendFlags |= MTPmessages_SendMessage::Flag::f_invert_media;
 			mediaFlags |= MTPmessages_SendMedia::Flag::f_invert_media;
@@ -4170,7 +4171,8 @@ void ApiWrap::sendMediaWithRandomId(
 		| (options.scheduled ? Flag::f_schedule_date : Flag(0))
 		| (options.sendAs ? Flag::f_send_as : Flag(0))
 		| (options.shortcutId ? Flag::f_quick_reply_shortcut : Flag(0))
-		| (options.effectId ? Flag::f_effect : Flag(0));
+		| (options.effectId ? Flag::f_effect : Flag(0))
+		| (options.invertCaption ? Flag::f_invert_media : Flag(0));
 
 	auto &histories = history->owner().histories();
 	const auto peer = history->peer;
@@ -4280,7 +4282,8 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 		| (album->options.shortcutId
 			? Flag::f_quick_reply_shortcut
 			: Flag(0))
-		| (album->options.effectId ? Flag::f_effect : Flag(0));
+		| (album->options.effectId ? Flag::f_effect : Flag(0))
+		| (album->options.invertCaption ? Flag::f_invert_media : Flag(0));
 	auto &histories = history->owner().histories();
 	const auto peer = history->peer;
 	histories.sendPreparedMessage(
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index c28a1dc709ece..c38004f7b8ac0 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -350,9 +350,8 @@ SendFilesBox::SendFilesBox(QWidget*, SendFilesBoxDescriptor &&descriptor)
 , _titleHeight(st::boxTitleHeight)
 , _list(std::move(descriptor.list))
 , _limits(descriptor.limits)
-, _sendMenuDetails(descriptor.sendMenuDetails
-	? descriptor.sendMenuDetails
-	: [] { return SendMenu::Details(); })
+, _sendMenuDetails(prepareSendMenuDetails(descriptor))
+, _sendMenuCallback(prepareSendMenuCallback())
 , _captionToPeer(descriptor.captionToPeer)
 , _check(std::move(descriptor.check))
 , _confirmedCallback(std::move(descriptor.confirmed))
@@ -366,6 +365,50 @@ SendFilesBox::SendFilesBox(QWidget*, SendFilesBoxDescriptor &&descriptor)
 	enqueueNextPrepare();
 }
 
+Fn<SendMenu::Details()> SendFilesBox::prepareSendMenuDetails(
+		const SendFilesBoxDescriptor &descriptor) {
+	auto initial = descriptor.sendMenuDetails;
+	return crl::guard(this, [=] {
+		auto result = initial ? initial() : SendMenu::Details();
+		result.spoiler = !hasSpoilerMenu()
+			? SendMenu::SpoilerState::None
+			: allWithSpoilers()
+			? SendMenu::SpoilerState::Enabled
+			: SendMenu::SpoilerState::Possible;
+		const auto way = _sendWay.current();
+		const auto canMoveCaption = _list.canMoveCaption(
+			way.groupFiles() && way.sendImagesAsPhotos(),
+			way.sendImagesAsPhotos()
+		) && _caption && !_caption->getLastText().isEmpty();
+		result.caption = !canMoveCaption
+			? SendMenu::CaptionState::None
+			: _invertCaption
+			? SendMenu::CaptionState::Above
+			: SendMenu::CaptionState::Below;
+		return result;
+	});
+}
+
+auto SendFilesBox::prepareSendMenuCallback()
+-> Fn<void(MenuAction, MenuDetails)> {
+	return crl::guard(this, [=](MenuAction action, MenuDetails details) {
+		using Type = SendMenu::ActionType;
+		switch (action.type) {
+		case Type::CaptionDown: _invertCaption = false; break;
+		case Type::CaptionUp: _invertCaption = true; break;
+		case Type::SpoilerOn: toggleSpoilers(true); break;
+		case Type::SpoilerOff: toggleSpoilers(false); break;
+		default:
+			SendMenu::DefaultCallback(
+				_show,
+				sendCallback())(
+					action,
+					details);
+			break;
+		}
+	});
+}
+
 void SendFilesBox::initPreview() {
 	using namespace rpl::mappers;
 
@@ -533,7 +576,7 @@ void SendFilesBox::refreshButtons() {
 			_send,
 			_show,
 			_sendMenuDetails,
-			SendMenu::DefaultCallback(_show, sendCallback()));
+			_sendMenuCallback);
 	}
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 	_addFile = addLeftButton(
@@ -545,8 +588,10 @@ void SendFilesBox::refreshButtons() {
 	addMenuButton();
 }
 
-bool SendFilesBox::hasSendMenu() const {
-	return (_sendMenuDetails().type != SendMenu::Type::Disabled);
+bool SendFilesBox::hasSendMenu(const SendMenu::Details &details) const {
+	return (details.type != SendMenu::Type::Disabled)
+		|| (details.spoiler != SendMenu::SpoilerState::None)
+		|| (details.caption != SendMenu::CaptionState::None);
 }
 
 bool SendFilesBox::hasSpoilerMenu() const {
@@ -583,7 +628,8 @@ void SendFilesBox::toggleSpoilers(bool enabled) {
 }
 
 void SendFilesBox::addMenuButton() {
-	if (!hasSendMenu() && !hasSpoilerMenu()) {
+	const auto details = _sendMenuDetails();
+	if (!hasSendMenu(details)) {
 		return;
 	}
 
@@ -592,31 +638,16 @@ void SendFilesBox::addMenuButton() {
 		const auto &tabbed = _st.tabbed;
 		const auto &icons = tabbed.icons;
 		_menu = base::make_unique_q<Ui::PopupMenu>(top, tabbed.menu);
-		if (hasSpoilerMenu()) {
-			const auto spoilered = allWithSpoilers();
-			_menu->addAction(
-				(spoilered
-					? tr::lng_context_disable_spoiler(tr::now)
-					: tr::lng_context_spoiler_effect(tr::now)),
-				[=] { toggleSpoilers(!spoilered); },
-				spoilered ? &icons.menuSpoilerOff : &icons.menuSpoiler);
-			if (hasSendMenu()) {
-				_menu->addSeparator(&tabbed.expandedSeparator);
-			}
-		}
-		if (hasSendMenu()) {
-			SendMenu::FillSendMenu(
-				_menu.get(),
-				_show,
-				_sendMenuDetails(),
-				SendMenu::DefaultCallback(_show, sendCallback()),
-				&_st.tabbed.icons,
-				QCursor::pos());
-		}
+		SendMenu::FillSendMenu(
+			_menu.get(),
+			_show,
+			_sendMenuDetails(),
+			_sendMenuCallback,
+			&_st.tabbed.icons,
+			QCursor::pos());
 		_menu->popup(QCursor::pos());
 		return true;
 	});
-
 }
 
 void SendFilesBox::initSendWay() {
@@ -658,9 +689,7 @@ void SendFilesBox::initSendWay() {
 		for (auto &block : _blocks) {
 			block.setSendWay(value);
 		}
-		if (!hasSendMenu()) {
-			refreshButtons();
-		}
+		refreshButtons();
 		if (was != hidden()) {
 			updateBoxSize();
 			updateControlsGeometry();
@@ -872,9 +901,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 }
 
 void SendFilesBox::refreshControls(bool initial) {
-	if (initial || !hasSendMenu()) {
-		refreshButtons();
-	}
+	refreshButtons();
 	refreshTitleText();
 	updateSendWayControls();
 	updateCaptionPlaceholder();
@@ -1426,9 +1453,12 @@ void SendFilesBox::send(
 	if ((_sendType == Api::SendType::Scheduled
 		|| _sendType == Api::SendType::ScheduledToUser)
 		&& !options.scheduled) {
+		auto child = _sendMenuDetails();
+		child.spoiler = SendMenu::SpoilerState::None;
+		child.caption = SendMenu::CaptionState::None;
 		return SendMenu::DefaultCallback(_show, sendCallback())(
 			{ .type = SendMenu::ActionType::Schedule },
-			_sendMenuDetails());
+			child);
 	}
 	if (_preparing) {
 		_whenReadySend = [=] {
@@ -1453,6 +1483,7 @@ void SendFilesBox::send(
 		auto caption = (_caption && !_caption->isHidden())
 			? _caption->getTextWithAppliedMarkdown()
 			: TextWithTags();
+		options.invertCaption = _invertCaption;
 		if (!validateLength(caption.text)) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index f6de4a4f8d034..1e95a1aa81365 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -48,6 +48,7 @@ class SessionController;
 
 namespace SendMenu {
 struct Details;
+struct Action;
 } // namespace SendMenu
 
 namespace HistoryView::Controls {
@@ -136,6 +137,9 @@ class SendFilesBox : public Ui::BoxContent {
 	void resizeEvent(QResizeEvent *e) override;
 
 private:
+	using MenuAction = SendMenu::Action;
+	using MenuDetails = SendMenu::Details;
+
 	class Block final {
 	public:
 		Block(
@@ -173,7 +177,7 @@ class SendFilesBox : public Ui::BoxContent {
 
 	void initSendWay();
 	void initPreview();
-	[[nodiscard]] bool hasSendMenu() const;
+	[[nodiscard]] bool hasSendMenu(const MenuDetails &details) const;
 	[[nodiscard]] bool hasSpoilerMenu() const;
 	[[nodiscard]] bool allWithSpoilers();
 	[[nodiscard]] bool checkWithWay(
@@ -225,6 +229,11 @@ class SendFilesBox : public Ui::BoxContent {
 
 	void checkCharsLimitation();
 
+	[[nodiscard]] Fn<MenuDetails()> prepareSendMenuDetails(
+		const SendFilesBoxDescriptor &descriptor);
+	[[nodiscard]] auto prepareSendMenuCallback()
+		-> Fn<void(MenuAction, MenuDetails)>;
+
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const style::ComposeControls &_st;
 	const Api::SendType _sendType = Api::SendType();
@@ -236,12 +245,14 @@ class SendFilesBox : public Ui::BoxContent {
 	std::optional<int> _removingIndex;
 
 	SendFilesLimits _limits = {};
-	Fn<SendMenu::Details()> _sendMenuDetails = nullptr;
+	Fn<MenuDetails()> _sendMenuDetails;
+	Fn<void(MenuAction, MenuDetails)> _sendMenuCallback;
 	PeerData *_captionToPeer = nullptr;
 	SendFilesCheck _check;
 	SendFilesConfirmed _confirmedCallback;
 	Fn<void()> _cancelledCallback;
 	bool _confirmed = false;
+	bool _invertCaption = false;
 
 	object_ptr<Ui::InputField> _caption = { nullptr };
 	TextWithTags _prefilledCaptionText;
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index d69d4e6bb1c93..8439c5eeee8f6 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -69,6 +69,8 @@ ComposeIcons {
 	menuWhenOnline: icon;
 	menuSpoiler: icon;
 	menuSpoilerOff: icon;
+	menuBelow: icon;
+	menuAbove: icon;
 
 	stripBubble: icon;
 	stripExpandPanel: icon;
@@ -606,6 +608,8 @@ defaultComposeIcons: ComposeIcons {
 	menuWhenOnline: menuIconWhenOnline;
 	menuSpoiler: menuIconSpoiler;
 	menuSpoilerOff: menuIconSpoilerOff;
+	menuBelow: menuIconBelow;
+	menuAbove: menuIconAbove;
 
 	stripBubble: icon{
 		{ "chat/reactions_bubble_shadow", windowShadowFg },
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index f1175a47340ff..2b42a740d58eb 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -1104,6 +1104,7 @@ void Reactions::defaultUpdated() {
 	}
 	refreshMyTags();
 	refreshTags();
+	refreshEffects();
 	_defaultUpdated.fire({});
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.cpp b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
index 9d32a126a5ccb..773239e0b582c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_share.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
@@ -141,6 +141,9 @@ namespace Media::Stories {
 			if (options.effectId) {
 				sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
 			}
+			if (options.invertCaption) {
+				sendFlags |= MTPmessages_SendMedia::Flag::f_invert_media;
+			}
 			const auto done = [=] {
 				if (!--state->requests) {
 					if (show->valid()) {
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 5da7f93a84fbc..99d9b4288ea2c 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -636,6 +636,8 @@ storiesEmojiPan: EmojiPan(defaultEmojiPan) {
 		menuWhenOnline: icon {{ "menu/send_when_online", storiesComposeWhiteText }};
 		menuSpoiler: icon {{ "menu/spoiler_on", storiesComposeWhiteText }};
 		menuSpoilerOff: icon {{ "menu/spoiler_off", storiesComposeWhiteText }};
+		menuBelow: icon {{ "menu/link_below", storiesComposeWhiteText }};
+		menuAbove: icon {{ "menu/link_above", storiesComposeWhiteText }};
 
 		stripBubble: icon{
 			{ "chat/reactions_bubble_shadow", windowShadowFg },
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 67e5deaf8c235..4bdd5709b1e8e 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -615,13 +615,47 @@ FillMenuResult FillSendMenu(
 		const style::ComposeIcons *iconsOverride,
 		std::optional<QPoint> desiredPositionOverride) {
 	const auto type = details.type;
-	if (type == Type::Disabled || !action) {
+	const auto empty = (type == Type::Disabled)
+		&& (details.spoiler == SpoilerState::None)
+		&& (details.caption == CaptionState::None);
+	if (empty || !action) {
 		return FillMenuResult::Skipped;
 	}
 	const auto &icons = iconsOverride
 		? *iconsOverride
 		: st::defaultComposeIcons;
 
+	auto toggles = false;
+	if (details.spoiler != SpoilerState::None) {
+		const auto spoilered = (details.spoiler == SpoilerState::Enabled);
+		menu->addAction(
+			(spoilered
+				? tr::lng_context_disable_spoiler(tr::now)
+				: tr::lng_context_spoiler_effect(tr::now)),
+			[=] { action({ .type = spoilered
+				? ActionType::SpoilerOff
+				: ActionType::SpoilerOn
+			}, details); },
+			spoilered ? &icons.menuSpoilerOff : &icons.menuSpoiler);
+		toggles = true;
+	}
+	if (details.caption != CaptionState::None) {
+		const auto above = (details.caption == CaptionState::Above);
+		menu->addAction(
+			(above
+				? tr::lng_caption_move_down(tr::now)
+				: tr::lng_caption_move_up(tr::now)),
+			[=] { action({ .type = above
+				? ActionType::CaptionDown
+				: ActionType::CaptionUp
+			}, details); },
+			above ? &icons.menuBelow : &icons.menuAbove);
+		toggles = true;
+	}
+	if (toggles && type != Type::Disabled) {
+		menu->addSeparator();
+	}
+
 	if (type != Type::Reminder) {
 		menu->addAction(
 			tr::lng_send_silent_message(tr::now),
diff --git a/Telegram/SourceFiles/menu/menu_send.h b/Telegram/SourceFiles/menu/menu_send.h
index f503a7e56275b..2c6dbb9b721ba 100644
--- a/Telegram/SourceFiles/menu/menu_send.h
+++ b/Telegram/SourceFiles/menu/menu_send.h
@@ -29,7 +29,7 @@ class Thread;
 
 namespace SendMenu {
 
-enum class Type {
+enum class Type : uchar {
 	Disabled,
 	SilentOnly,
 	Scheduled,
@@ -37,20 +37,38 @@ enum class Type {
 	Reminder,
 };
 
+enum class SpoilerState : uchar {
+	None,
+	Enabled,
+	Possible,
+};
+
+enum class CaptionState : uchar {
+	None,
+	Below,
+	Above,
+};
+
 struct Details {
 	Type type = Type::Disabled;
+	SpoilerState spoiler = SpoilerState::None;
+	CaptionState caption = CaptionState::None;
 	bool effectAllowed = false;
 };
 
-enum class FillMenuResult {
+enum class FillMenuResult : uchar {
 	Prepared,
 	Skipped,
 	Failed,
 };
 
-enum class ActionType {
+enum class ActionType : uchar {
 	Send,
 	Schedule,
+	SpoilerOn,
+	SpoilerOff,
+	CaptionUp,
+	CaptionDown,
 };
 struct Action {
 	using Type = ActionType;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 6ca3bd2416d50..ebdf9ac6f7c69 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -184,6 +184,17 @@ bool PreparedList::canAddCaption(bool sendingAlbum, bool compress) const {
 	return !hasFiles && !hasMusic && !hasNotGrouped;
 }
 
+bool PreparedList::canMoveCaption(bool sendingAlbum, bool compress) const {
+	if (!canAddCaption(sendingAlbum, compress)) {
+		return false;
+	} else if (files.size() != 1) {
+		return true;
+	}
+	const auto &file = files.front();
+	return (file.type == PreparedFile::Type::Video)
+		|| (file.type == PreparedFile::Type::Photo && compress);
+}
+
 bool PreparedList::hasGroupOption(bool slowmode) const {
 	if (slowmode || files.size() < 2) {
 		return false;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index c6a74790a7cb6..e467cc61163db 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -112,6 +112,9 @@ struct PreparedList {
 	void mergeToEnd(PreparedList &&other, bool cutToAlbumSize = false);
 
 	[[nodiscard]] bool canAddCaption(bool sendingAlbum, bool compress) const;
+	[[nodiscard]] bool canMoveCaption(
+		bool sendingAlbum,
+		bool compress) const;
 	[[nodiscard]] bool canBeSentInSlowmode() const;
 	[[nodiscard]] bool canBeSentInSlowmodeWith(
 		const PreparedList &other) const;

From 8c0351be4ea099b77c5552adea7783e2c3727763 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 May 2024 23:09:51 +0400
Subject: [PATCH 283/400] Allow editing caption above/below media.

---
 .../SourceFiles/boxes/edit_caption_box.cpp    |  23 +--
 Telegram/SourceFiles/boxes/edit_caption_box.h |   4 -
 Telegram/SourceFiles/boxes/send_files_box.cpp |   7 +-
 .../SourceFiles/history/history_widget.cpp    |  41 ++++--
 Telegram/SourceFiles/history/history_widget.h |   1 +
 .../history_view_compose_controls.cpp         |  31 ++--
 ...istory_view_compose_media_edit_manager.cpp | 132 +++++++++++++-----
 .../history_view_compose_media_edit_manager.h |  35 ++++-
 .../view/media/history_view_media_grouped.cpp |   2 +-
 Telegram/SourceFiles/menu/menu_send.cpp       |  15 +-
 10 files changed, 200 insertions(+), 91 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index be4d4e7fad85f..bb9914f095414 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -38,6 +38,7 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "mainwidget.h" // controller->content() -> QWidget*
+#include "menu/menu_send.h"
 #include "mtproto/mtproto_config.h"
 #include "platform/platform_specific.h"
 #include "storage/localimageloader.h" // SendMediaType
@@ -225,13 +226,6 @@ void EditPhotoImage(
 
 } // namespace
 
-EditCaptionBox::EditCaptionBox(
-	QWidget*,
-	not_null<Window::SessionController*> controller,
-	not_null<HistoryItem*> item)
-: EditCaptionBox({}, controller, item, PrepareEditText(item), {}, {}) {
-}
-
 EditCaptionBox::EditCaptionBox(
 	QWidget*,
 	not_null<Window::SessionController*> controller,
@@ -365,9 +359,21 @@ void EditCaptionBox::StartPhotoEdit(
 }
 
 void EditCaptionBox::prepare() {
-	addButton(tr::lng_settings_save(), [=] { save(); });
+	const auto button = addButton(tr::lng_settings_save(), [=] { save(); });
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 
+	const auto details = crl::guard(this, [=] {
+		return SendMenu::Details();
+	});
+	const auto callback = [=](SendMenu::Action action, const auto &) {
+
+	};
+	SendMenu::SetupMenuAndShortcuts(
+		button,
+		nullptr,
+		details,
+		crl::guard(this, callback));
+
 	updateBoxSize();
 
 	setupField();
@@ -899,6 +905,7 @@ void EditCaptionBox::save() {
 	auto options = Api::SendOptions();
 	options.scheduled = item->isScheduled() ? item->date() : 0;
 	options.shortcutId = item->shortcutId();
+	//options.invertCaption = _invertCaption;
 
 	if (!_preparedList.files.empty()) {
 		if ((_albumType != Ui::AlbumType::None)
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.h b/Telegram/SourceFiles/boxes/edit_caption_box.h
index 110c0e58849d7..b3a10f43fb283 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.h
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.h
@@ -32,10 +32,6 @@ enum class AlbumType;
 
 class EditCaptionBox final : public Ui::BoxContent {
 public:
-	EditCaptionBox(
-		QWidget*,
-		not_null<Window::SessionController*> controller,
-		not_null<HistoryItem*> item);
 	EditCaptionBox(
 		QWidget*,
 		not_null<Window::SessionController*> controller,
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index c38004f7b8ac0..0656488eedba6 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -379,7 +379,7 @@ Fn<SendMenu::Details()> SendFilesBox::prepareSendMenuDetails(
 		const auto canMoveCaption = _list.canMoveCaption(
 			way.groupFiles() && way.sendImagesAsPhotos(),
 			way.sendImagesAsPhotos()
-		) && _caption && !_caption->getLastText().isEmpty();
+		) && _caption && HasSendText(_caption);
 		result.caption = !canMoveCaption
 			? SendMenu::CaptionState::None
 			: _invertCaption
@@ -638,14 +638,15 @@ void SendFilesBox::addMenuButton() {
 		const auto &tabbed = _st.tabbed;
 		const auto &icons = tabbed.icons;
 		_menu = base::make_unique_q<Ui::PopupMenu>(top, tabbed.menu);
+		const auto position = QCursor::pos();
 		SendMenu::FillSendMenu(
 			_menu.get(),
 			_show,
 			_sendMenuDetails(),
 			_sendMenuCallback,
 			&_st.tabbed.icons,
-			QCursor::pos());
-		_menu->popup(QCursor::pos());
+			position);
+		_menu->popup(position);
 		return true;
 	});
 }
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index e68bade1a4130..bcbada5720cd5 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -324,7 +324,12 @@ HistoryWidget::HistoryWidget(
 	{
 		using namespace SendMenu;
 		const auto sendAction = [=](Action action, Details) {
-			if (action.type == ActionType::Send) {
+			if (action.type == ActionType::CaptionUp
+				|| action.type == ActionType::CaptionDown
+				|| action.type == ActionType::SpoilerOn
+				|| action.type == ActionType::SpoilerOff) {
+				_mediaEditSpoiler.apply(action);
+			} else if (action.type == ActionType::Send) {
 				send(action.options);
 			} else {
 				sendScheduled(action.options);
@@ -2672,7 +2677,7 @@ void HistoryWidget::setEditMsgId(MsgId msgId) {
 	unregisterDraftSources();
 	_editMsgId = msgId;
 	if (!msgId) {
-		_mediaEditSpoiler.setSpoilerOverride(std::nullopt);
+		_mediaEditSpoiler.cancel();
 		_canReplaceMedia = false;
 		if (_preview) {
 			_preview->setDisabled(false);
@@ -4056,15 +4061,14 @@ void HistoryWidget::saveEditMsg() {
 		})();
 	};
 
-	auto options = Api::SendOptions();
 	_saveEditMsgRequestId = Api::EditTextMessage(
 		item,
 		sending,
 		webPageDraft,
-		options,
+		{ .invertCaption = _mediaEditSpoiler.invertCaption() },
 		done,
 		fail,
-		_mediaEditSpoiler.spoilerOverride());
+		_mediaEditSpoiler.spoilered());
 }
 
 void HistoryWidget::hideChildWidgets() {
@@ -4222,6 +4226,12 @@ SendMenu::Details HistoryWidget::sendMenuDetails() const {
 	return { .type = type, .effectAllowed = effectAllowed };
 }
 
+SendMenu::Details HistoryWidget::saveMenuDetails() const {
+	return (_editMsgId && _replyEditMsg)
+		? _mediaEditSpoiler.sendMenuDetails(HasSendText(_field))
+		: SendMenu::Details();
+}
+
 auto HistoryWidget::computeSendButtonType() const {
 	using Type = Ui::SendButton::Type;
 
@@ -4236,7 +4246,11 @@ auto HistoryWidget::computeSendButtonType() const {
 }
 
 SendMenu::Details HistoryWidget::sendButtonMenuDetails() const {
-	if (computeSendButtonType() != Ui::SendButton::Type::Send) {
+	using Type = Ui::SendButton::Type;
+	const auto type = computeSendButtonType();
+	if (type == Type::Save) {
+		return saveMenuDetails();
+	} else if (type != Type::Send) {
 		return {};
 	}
 	return sendMenuDetails();
@@ -6587,8 +6601,8 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 		&& (e->button() == Qt::RightButton)) {
 		_mediaEditSpoiler.showMenu(
 			_list,
-			session().data().message(_history->peer, _editMsgId),
-			[=](bool) { mouseMoveEvent(nullptr); });
+			[=] { mouseMoveEvent(nullptr); },
+			HasSendText(_field));
 	} else if (_inPhotoEdit && _photoEditMedia) {
 		EditCaptionBox::StartPhotoEdit(
 			controller(),
@@ -8171,6 +8185,9 @@ void HistoryWidget::updateReplyEditTexts(bool force) {
 		const auto editMedia = _editMsgId
 			? _replyEditMsg->media()
 			: nullptr;
+		if (_editMsgId && _replyEditMsg) {
+			_mediaEditSpoiler.start(_replyEditMsg);
+		}
 		_canReplaceMedia = editMedia && editMedia->allowsEditMedia();
 		_photoEditMedia = (_canReplaceMedia
 			&& editMedia->photo()
@@ -8264,14 +8281,12 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 		? drawMsgText->media()
 		: nullptr;
 	const auto hasPreview = media && media->hasReplyPreview();
-	const auto preview = _mediaEditSpoiler.spoilerOverride()
-		? _mediaEditSpoiler.mediaPreview(drawMsgText)
+	const auto preview = _mediaEditSpoiler
+		? _mediaEditSpoiler.mediaPreview()
 		: hasPreview
 		? media->replyPreview()
 		: nullptr;
-	const auto spoilered = _mediaEditSpoiler.spoilerOverride()
-		? (*_mediaEditSpoiler.spoilerOverride())
-		: (preview && media->hasSpoiler());
+	const auto spoilered = _mediaEditSpoiler.spoilered();
 	if (!spoilered) {
 		_replySpoiler = nullptr;
 	} else if (!_replySpoiler) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index bc3641e6744ab..f829cf7975f66 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -269,6 +269,7 @@ class HistoryWidget final
 	void clearSelected();
 
 	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
+	[[nodiscard]] SendMenu::Details saveMenuDetails() const;
 	bool sendExistingDocument(
 		not_null<DocumentData*> document,
 		Api::SendOptions options,
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 c81c59b8c3da7..6c985bbf07bcb 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -124,7 +124,8 @@ class FieldHeader final : public Ui::RpWidget {
 public:
 	FieldHeader(
 		QWidget *parent,
-		std::shared_ptr<ChatHelpers::Show> show);
+		std::shared_ptr<ChatHelpers::Show> show,
+		Fn<bool()> hasSendText);
 
 	void setHistory(const SetHistoryArgs &args);
 	void updateTopicRootId(MsgId topicRootId);
@@ -187,6 +188,8 @@ class FieldHeader final : public Ui::RpWidget {
 	};
 
 	const std::shared_ptr<ChatHelpers::Show> _show;
+	const Fn<bool()> _hasSendText;
+
 	History *_history = nullptr;
 	MsgId _topicRootId = 0;
 
@@ -230,9 +233,11 @@ class FieldHeader final : public Ui::RpWidget {
 
 FieldHeader::FieldHeader(
 	QWidget *parent,
-	std::shared_ptr<ChatHelpers::Show> show)
+	std::shared_ptr<ChatHelpers::Show> show,
+	Fn<bool()> hasSendText)
 : RpWidget(parent)
 , _show(std::move(show))
+, _hasSendText(std::move(hasSendText))
 , _forwardPanel(
 	std::make_unique<ForwardPanel>([=] { customEmojiRepaint(); }))
 , _data(&_show->session().data())
@@ -406,8 +411,8 @@ void FieldHeader::init() {
 				if (inPreviewRect && isEditingMessage()) {
 					_mediaEditSpoiler.showMenu(
 						this,
-						_data->message(_editMsgId.current()),
-						[=](bool) { update(); });
+						[=] { update(); },
+						_hasSendText());
 				} else if (const auto reply = replyingToMessage()) {
 					_jumpToItemRequests.fire_copy(reply);
 				}
@@ -582,14 +587,12 @@ void FieldHeader::paintEditOrReplyToMessage(Painter &p) {
 
 	const auto media = _shownMessage->media();
 	_shownMessageHasPreview = media && media->hasReplyPreview();
-	const auto preview = _mediaEditSpoiler.spoilerOverride()
-		? _mediaEditSpoiler.mediaPreview(_shownMessage)
+	const auto preview = _mediaEditSpoiler
+		? _mediaEditSpoiler.mediaPreview()
 		: _shownMessageHasPreview
 		? media->replyPreview()
 		: nullptr;
-	const auto spoilered = _mediaEditSpoiler.spoilerOverride()
-		? (*_mediaEditSpoiler.spoilerOverride())
-		: (preview && media->hasSpoiler());
+	const auto spoilered = _mediaEditSpoiler.spoilered();
 	if (!spoilered) {
 		_shownPreviewSpoiler = nullptr;
 	} else if (!_shownPreviewSpoiler) {
@@ -734,7 +737,7 @@ void FieldHeader::editMessage(FullMsgId id, bool photoEditAllowed) {
 	_photoEditAllowed = photoEditAllowed;
 	_editMsgId = id;
 	if (!photoEditAllowed) {
-		_mediaEditSpoiler.setSpoilerOverride(std::nullopt);
+		_mediaEditSpoiler.cancel();
 		_inPhotoEdit = false;
 		_inPhotoEditOver.stop();
 	}
@@ -781,8 +784,9 @@ MessageToEdit FieldHeader::queryToEdit() {
 		.options = {
 			.scheduled = item->isScheduled() ? item->date() : 0,
 			.shortcutId = item->shortcutId(),
+			.invertCaption = _mediaEditSpoiler.invertCaption(),
 		},
-		.spoilerMediaOverride = _mediaEditSpoiler.spoilerOverride(),
+		.spoilerMediaOverride = _mediaEditSpoiler.spoilered(),
 	};
 }
 
@@ -842,7 +846,10 @@ ComposeControls::ComposeControls(
 	parent,
 	_show,
 	&_st.tabbed))
-, _header(std::make_unique<FieldHeader>(_wrap.get(), _show))
+, _header(std::make_unique<FieldHeader>(
+	_wrap.get(),
+	_show,
+	[=] { return HasSendText(_field); }))
 , _voiceRecordBar(std::make_unique<VoiceRecordBar>(
 	_wrap.get(),
 	Controls::VoiceRecordBarDescriptor{
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 d6c58bb6adcbc..f20681a0fcc56 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
@@ -10,74 +10,134 @@ For license and copyright information please follow this link:
 #include "data/data_document.h"
 #include "data/data_file_origin.h"
 #include "data/data_photo.h"
+#include "data/data_session.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
+#include "menu/menu_send.h"
 #include "ui/widgets/popup_menu.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
 namespace HistoryView {
 
 MediaEditSpoilerManager::MediaEditSpoilerManager() = default;
 
+void MediaEditSpoilerManager::start(not_null<HistoryItem*> item) {
+	const auto media = item->media();
+	if (!media) {
+		return;
+	}
+	_item = item;
+	_spoilered = media->hasSpoiler();
+	_invertCaption = item->invertMedia();
+	_lifetime = item->history()->owner().itemRemoved(
+	) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
+		if (removed == _item) {
+			cancel();
+		}
+	});
+}
+
+void MediaEditSpoilerManager::apply(SendMenu::Action action) {
+	using Type = SendMenu::Action::Type;
+	if (action.type == Type::CaptionUp) {
+		_invertCaption = true;
+	} else if (action.type == Type::CaptionDown) {
+		_invertCaption = false;
+	} else if (action.type == Type::SpoilerOn) {
+		_spoilered = true;
+	} else if (action.type == Type::SpoilerOff) {
+		_spoilered = false;
+	}
+}
+
+void MediaEditSpoilerManager::cancel() {
+	_menu = nullptr;
+	_item = nullptr;
+	_lifetime.destroy();
+}
+
 void MediaEditSpoilerManager::showMenu(
 		not_null<Ui::RpWidget*> parent,
-		not_null<HistoryItem*> item,
-		Fn<void(bool)> callback) {
-	const auto media = item->media();
+		Fn<void()> finished,
+		bool hasCaptionText) {
+	if (!_item) {
+		return;
+	}
+	const auto media = _item->media();
 	const auto hasPreview = media && media->hasReplyPreview();
 	const auto preview = hasPreview ? media->replyPreview() : nullptr;
 	if (!preview || (media && media->webpage())) {
 		return;
 	}
-	const auto spoilered = _spoilerOverride
-		? (*_spoilerOverride)
-		: (preview && media->hasSpoiler());
-	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+	_menu = base::make_unique_q<Ui::PopupMenu>(
 		parent,
 		st::popupMenuWithIcons);
-	menu->addAction(
-		spoilered
-			? tr::lng_context_disable_spoiler(tr::now)
-			: tr::lng_context_spoiler_effect(tr::now),
-		[=] {
-			_spoilerOverride = (!spoilered);
-			if (callback) {
-				callback(!spoilered);
-			}
-		},
-		spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler);
-	menu->popup(QCursor::pos());
+	const auto callback = [=](SendMenu::Action action, const auto &) {
+		apply(action);
+	};
+	const auto position = QCursor::pos();
+	SendMenu::FillSendMenu(
+		_menu.get(),
+		nullptr,
+		sendMenuDetails(hasCaptionText),
+		callback,
+		&st::defaultComposeIcons,
+		position);
+	_menu->popup(position);
 }
 
-[[nodiscard]] Image *MediaEditSpoilerManager::mediaPreview(
-		not_null<HistoryItem*> item) {
-	if (!_spoilerOverride) {
-		return nullptr;
-	}
-	if (const auto media = item->media()) {
+[[nodiscard]] Image *MediaEditSpoilerManager::mediaPreview() {
+	if (const auto media = _item ? _item->media() : nullptr) {
 		if (const auto photo = media->photo()) {
 			return photo->getReplyPreview(
-				item->fullId(),
-				item->history()->peer,
-				*_spoilerOverride);
+				_item->fullId(),
+				_item->history()->peer,
+				_spoilered);
 		} else if (const auto document = media->document()) {
 			return document->getReplyPreview(
-				item->fullId(),
-				item->history()->peer,
-				*_spoilerOverride);
+				_item->fullId(),
+				_item->history()->peer,
+				_spoilered);
 		}
 	}
 	return nullptr;
 }
 
-void MediaEditSpoilerManager::setSpoilerOverride(
-		std::optional<bool> spoilerOverride) {
-	_spoilerOverride = spoilerOverride;
+bool MediaEditSpoilerManager::spoilered() const {
+	return _spoilered;
+}
+
+bool MediaEditSpoilerManager::invertCaption() const {
+	return _invertCaption;
 }
 
-std::optional<bool> MediaEditSpoilerManager::spoilerOverride() const {
-	return _spoilerOverride;
+SendMenu::Details MediaEditSpoilerManager::sendMenuDetails(
+		bool hasCaptionText) const {
+	const auto media = _item ? _item->media() : nullptr;
+	if (!media) {
+		return {};
+	}
+	const auto editingMedia = media->allowsEditMedia();
+	const auto editPhoto = editingMedia ? media->photo() : nullptr;
+	const auto editDocument = editingMedia ? media->document() : nullptr;
+	const auto canSaveSpoiler = (editPhoto && !editPhoto->isNull())
+		|| (editDocument
+			&& (editDocument->isVideoFile() || editDocument->isGifv()));
+	const auto canMoveCaption = media->allowsEditCaption() && hasCaptionText;
+	return {
+		.spoiler = (!canSaveSpoiler
+			? SendMenu::SpoilerState::None
+			: _spoilered
+			? SendMenu::SpoilerState::Enabled
+			: SendMenu::SpoilerState::Possible),
+		.caption = (!canMoveCaption
+			? SendMenu::CaptionState::None
+			: _invertCaption
+			? SendMenu::CaptionState::Above
+			: SendMenu::CaptionState::Below),
+	};
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h
index 8bc34b7c4e0ee..0f9f49e2b2a30 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h
@@ -7,8 +7,16 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/unique_qptr.h"
+
+namespace SendMenu {
+struct Details;
+struct Action;
+} // namespace SendMenu
+
 namespace Ui {
 class RpWidget;
+class PopupMenu;
 } // namespace Ui
 
 class Image;
@@ -20,19 +28,34 @@ class MediaEditSpoilerManager final {
 public:
 	MediaEditSpoilerManager();
 
+	void start(not_null<HistoryItem*> item);
+	void apply(SendMenu::Action action);
+	void cancel();
+
 	void showMenu(
 		not_null<Ui::RpWidget*> parent,
-		not_null<HistoryItem*> item,
-		Fn<void(bool)> callback);
+		Fn<void()> finished,
+		bool hasCaptionText);
 
-	[[nodiscard]] Image *mediaPreview(not_null<HistoryItem*> item);
+	[[nodiscard]] Image *mediaPreview();
 
-	void setSpoilerOverride(std::optional<bool> spoilerOverride);
+	[[nodiscard]] bool spoilered() const;
+	[[nodiscard]] bool invertCaption() const;
 
-	std::optional<bool> spoilerOverride() const;
+	[[nodiscard]] SendMenu::Details sendMenuDetails(
+		bool hasCaptionText) const;
+
+	[[nodiscard]] explicit operator bool() const {
+		return _item != nullptr;
+	}
 
 private:
-	std::optional<bool> _spoilerOverride;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	HistoryItem *_item = nullptr;
+	bool _spoilered = false;
+	bool _invertCaption = false;
+
+	rpl::lifetime _lifetime;
 
 };
 
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 7d11579e9deba..c4e51f1745995 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -396,7 +396,7 @@ void GroupedMedia::draw(Painter &p, const PaintContext &context) const {
 	}
 
 	// date
-	if (_parent->media() == this) {
+	if (_parent->media() == this && isBubbleBottom()) {
 		auto fullRight = width();
 		auto fullBottom = height();
 		if (needInfoDisplay()) {
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 4bdd5709b1e8e..a1c8909fbbdde 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -615,7 +615,8 @@ FillMenuResult FillSendMenu(
 		const style::ComposeIcons *iconsOverride,
 		std::optional<QPoint> desiredPositionOverride) {
 	const auto type = details.type;
-	const auto empty = (type == Type::Disabled)
+	const auto sending = (type != Type::Disabled);
+	const auto empty = !sending
 		&& (details.spoiler == SpoilerState::None)
 		&& (details.caption == CaptionState::None);
 	if (empty || !action) {
@@ -653,18 +654,16 @@ FillMenuResult FillSendMenu(
 		toggles = true;
 	}
 	if (toggles && type != Type::Disabled) {
-		menu->addSeparator();
+		menu->addSeparator(&st::expandedMenuSeparator);
 	}
 
-	if (type != Type::Reminder) {
+	if (sending && type != Type::Reminder) {
 		menu->addAction(
 			tr::lng_send_silent_message(tr::now),
-			[=] { action(
-				{ Api::SendOptions{ .silent = true } },
-				details); },
+			[=] { action({ Api::SendOptions{ .silent = true } }, details); },
 			&icons.menuMute);
 	}
-	if (type != Type::SilentOnly) {
+	if (sending && type != Type::SilentOnly) {
 		menu->addAction(
 			(type == Type::Reminder
 				? tr::lng_reminder_message(tr::now)
@@ -672,7 +671,7 @@ FillMenuResult FillSendMenu(
 			[=] { action({ .type = ActionType::Schedule }, details); },
 			&icons.menuSchedule);
 	}
-	if (type == Type::ScheduledToUser) {
+	if (sending && type == Type::ScheduledToUser) {
 		menu->addAction(
 			tr::lng_scheduled_send_until_online(tr::now),
 			[=] { action(

From 974bf999212d79d91a8c954da6506f3dafc3147b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 00:01:18 +0400
Subject: [PATCH 284/400] Allow editing spoiler/caption-above in
 EditCaptionBox.

---
 Telegram/SourceFiles/api/api_editing.cpp      | 155 +++++++++---------
 Telegram/SourceFiles/api/api_editing.h        |   2 +-
 Telegram/SourceFiles/api/api_sending.cpp      |   1 +
 .../SourceFiles/boxes/edit_caption_box.cpp    |  70 ++++++--
 Telegram/SourceFiles/boxes/edit_caption_box.h |  11 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  11 +-
 .../SourceFiles/history/history_widget.cpp    |  26 +--
 Telegram/SourceFiles/history/history_widget.h |   2 +-
 .../view/controls/compose_controls_common.h   |   2 +-
 .../history_view_compose_controls.cpp         |  25 ++-
 ...istory_view_compose_media_edit_manager.cpp |  43 +++--
 .../history_view_compose_media_edit_manager.h |  11 +-
 .../view/history_view_replies_section.cpp     |   6 +-
 .../view/history_view_replies_section.h       |   2 +-
 .../view/history_view_scheduled_section.cpp   |   6 +-
 .../view/history_view_scheduled_section.h     |   2 +-
 .../business/settings_shortcut_messages.cpp   |   8 +-
 .../attach_abstract_single_media_preview.cpp  |   5 +
 .../attach_abstract_single_media_preview.h    |   2 +
 .../ui/chat/attach/attach_prepare.cpp         |  12 ++
 .../ui/chat/attach/attach_prepare.h           |   1 +
 21 files changed, 247 insertions(+), 156 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_editing.cpp b/Telegram/SourceFiles/api/api_editing.cpp
index 60dfb4c69d7fc..b48ead0b8df80 100644
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -17,6 +17,7 @@ For license and copyright information please follow this link:
 #include "data/data_histories.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
+#include "history/view/controls/history_view_compose_media_edit_manager.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
@@ -255,85 +256,85 @@ mtpRequestId EditTextMessage(
 		SendOptions options,
 		Fn<void(mtpRequestId requestId)> done,
 		Fn<void(const QString &error, mtpRequestId requestId)> fail,
-		std::optional<bool> spoilerMediaOverride) {
-	if (spoilerMediaOverride) {
-		const auto spoiler = *spoilerMediaOverride;
-		if (const auto media = item->media()) {
-			auto takeInputMedia = Fn<std::optional<MTPInputMedia>()>(nullptr);
-			auto takeFileReference = Fn<QByteArray()>(nullptr);
-			if (const auto photo = media->photo()) {
-				using Flag = MTPDinputMediaPhoto::Flag;
-				const auto flags = Flag()
-					| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
-					| (spoiler ? Flag::f_spoiler : Flag());
-				takeInputMedia = [=] {
-					return MTP_inputMediaPhoto(
-						MTP_flags(flags),
-						photo->mtpInput(),
-						MTP_int(media->ttlSeconds()));
-				};
-				takeFileReference = [=] { return photo->fileReference(); };
-			} else if (const auto document = media->document()) {
-				using Flag = MTPDinputMediaDocument::Flag;
-				const auto flags = Flag()
-					| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
-					| (spoiler ? Flag::f_spoiler : Flag());
-				takeInputMedia = [=] {
-					return MTP_inputMediaDocument(
-						MTP_flags(flags),
-						document->mtpInput(),
-						MTP_int(media->ttlSeconds()),
-						MTPstring()); // query
-				};
-				takeFileReference = [=] { return document->fileReference(); };
-			}
-
-			const auto usedFileReference = takeFileReference
-				? takeFileReference()
-				: QByteArray();
-			const auto origin = item->fullId();
-			const auto api = &item->history()->session().api();
-			const auto performRequest = [=](
-					const auto &repeatRequest,
-					mtpRequestId originalRequestId) -> mtpRequestId {
-				const auto handleReference = [=](
-						const QString &error,
-						mtpRequestId requestId) {
-					if (error.startsWith(u"FILE_REFERENCE_"_q)) {
-						api->refreshFileReference(origin, [=](const auto &) {
-							if (takeFileReference &&
-								(takeFileReference() != usedFileReference)) {
-								repeatRequest(
-									repeatRequest,
-									originalRequestId
-										? originalRequestId
-										: requestId);
-							} else {
-								fail(error, requestId);
-							}
-						});
-					} else {
-						fail(error, requestId);
-					}
-				};
-				const auto callback = [=](
-						Fn<void()> applyUpdates,
-						mtpRequestId requestId) {
-					applyUpdates();
-					done(originalRequestId ? originalRequestId : requestId);
-				};
-				const auto requestId = EditMessage(
-					item,
-					caption,
-					webpage,
-					options,
-					callback,
-					handleReference,
-					takeInputMedia ? takeInputMedia() : std::nullopt);
-				return originalRequestId ? originalRequestId : requestId;
+		bool spoilered) {
+	const auto media = item->media();
+	if (media
+		&& HistoryView::MediaEditManager::CanBeSpoilered(item)
+		&& spoilered != media->hasSpoiler()) {
+		auto takeInputMedia = Fn<std::optional<MTPInputMedia>()>(nullptr);
+		auto takeFileReference = Fn<QByteArray()>(nullptr);
+		if (const auto photo = media->photo()) {
+			using Flag = MTPDinputMediaPhoto::Flag;
+			const auto flags = Flag()
+				| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
+				| (spoilered ? Flag::f_spoiler : Flag());
+			takeInputMedia = [=] {
+				return MTP_inputMediaPhoto(
+					MTP_flags(flags),
+					photo->mtpInput(),
+					MTP_int(media->ttlSeconds()));
+			};
+			takeFileReference = [=] { return photo->fileReference(); };
+		} else if (const auto document = media->document()) {
+			using Flag = MTPDinputMediaDocument::Flag;
+			const auto flags = Flag()
+				| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
+				| (spoilered ? Flag::f_spoiler : Flag());
+			takeInputMedia = [=] {
+				return MTP_inputMediaDocument(
+					MTP_flags(flags),
+					document->mtpInput(),
+					MTP_int(media->ttlSeconds()),
+					MTPstring()); // query
 			};
-			return performRequest(performRequest, 0);
+			takeFileReference = [=] { return document->fileReference(); };
 		}
+
+		const auto usedFileReference = takeFileReference
+			? takeFileReference()
+			: QByteArray();
+		const auto origin = item->fullId();
+		const auto api = &item->history()->session().api();
+		const auto performRequest = [=](
+				const auto &repeatRequest,
+				mtpRequestId originalRequestId) -> mtpRequestId {
+			const auto handleReference = [=](
+					const QString &error,
+					mtpRequestId requestId) {
+				if (error.startsWith(u"FILE_REFERENCE_"_q)) {
+					api->refreshFileReference(origin, [=](const auto &) {
+						if (takeFileReference &&
+							(takeFileReference() != usedFileReference)) {
+							repeatRequest(
+								repeatRequest,
+								originalRequestId
+									? originalRequestId
+									: requestId);
+						} else {
+							fail(error, requestId);
+						}
+					});
+				} else {
+					fail(error, requestId);
+				}
+			};
+			const auto callback = [=](
+					Fn<void()> applyUpdates,
+					mtpRequestId requestId) {
+				applyUpdates();
+				done(originalRequestId ? originalRequestId : requestId);
+			};
+			const auto requestId = EditMessage(
+				item,
+				caption,
+				webpage,
+				options,
+				callback,
+				handleReference,
+				takeInputMedia ? takeInputMedia() : std::nullopt);
+			return originalRequestId ? originalRequestId : requestId;
+		};
+		return performRequest(performRequest, 0);
 	}
 
 	const auto callback = [=](Fn<void()> applyUpdates, mtpRequestId id) {
diff --git a/Telegram/SourceFiles/api/api_editing.h b/Telegram/SourceFiles/api/api_editing.h
index c8d0f6c5092ac..630e1cd8d5a40 100644
--- a/Telegram/SourceFiles/api/api_editing.h
+++ b/Telegram/SourceFiles/api/api_editing.h
@@ -56,6 +56,6 @@ mtpRequestId EditTextMessage(
 	SendOptions options,
 	Fn<void(mtpRequestId requestId)> done,
 	Fn<void(const QString &error, mtpRequestId requestId)> fail,
-	std::optional<bool> spoilerMediaOverride);
+	bool spoilered);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index 8ab3d8bc7b762..ade419248fbab 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -514,6 +514,7 @@ void SendConfirmedFile(
 		edition.ttl = 0;
 		edition.mtpMedia = &media;
 		edition.textWithEntities = caption;
+		edition.invertMedia = file->to.options.invertCaption;
 		edition.useSameViews = true;
 		edition.useSameForwards = true;
 		edition.useSameMarkup = true;
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index bb9914f095414..d46121c2f9657 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -176,7 +176,7 @@ void ChooseReplacement(
 void EditPhotoImage(
 		not_null<Window::SessionController*> controller,
 		std::shared_ptr<Data::PhotoMedia> media,
-		bool wasSpoiler,
+		bool spoilered,
 		Fn<void(Ui::PreparedList)> done) {
 	const auto large = media
 		? media->image(Data::PhotoSize::Large)
@@ -199,7 +199,7 @@ void EditPhotoImage(
 
 		using ImageInfo = Ui::PreparedFileInformation::Image;
 		auto &file = list.files.front();
-		file.spoiler = wasSpoiler;
+		file.spoiler = spoilered;
 		const auto image = std::get_if<ImageInfo>(&file.information->media);
 
 		image->modifications = mods;
@@ -231,13 +231,13 @@ EditCaptionBox::EditCaptionBox(
 	not_null<Window::SessionController*> controller,
 	not_null<HistoryItem*> item,
 	TextWithTags &&text,
+	bool spoilered,
+	bool invertCaption,
 	Ui::PreparedList &&list,
 	Fn<void()> saved)
 : _controller(controller)
 , _historyItem(item)
-, _isAllowedEditMedia(item->media()
-	? item->media()->allowsEditMedia()
-	: false)
+, _isAllowedEditMedia(item->media() && item->media()->allowsEditMedia())
 , _albumType(ComputeAlbumType(item))
 , _controls(base::make_unique_q<Ui::VerticalLayout>(this))
 , _scroll(base::make_unique_q<Ui::ScrollArea>(this, st::boxScroll))
@@ -255,6 +255,8 @@ EditCaptionBox::EditCaptionBox(
 	Expects(item->media() != nullptr);
 	Expects(item->media()->allowsEditCaption());
 
+	_mediaEditManager.start(item, spoilered, invertCaption);
+
 	_controller->session().data().itemRemoved(
 		_historyItem->fullId()
 	) | rpl::start_with_next([=] {
@@ -268,6 +270,8 @@ void EditCaptionBox::StartMediaReplace(
 		not_null<Window::SessionController*> controller,
 		FullMsgId itemId,
 		TextWithTags text,
+		bool spoilered,
+		bool invertCaption,
 		Fn<void()> saved) {
 	const auto session = &controller->session();
 	const auto item = session->data().message(itemId);
@@ -279,6 +283,8 @@ void EditCaptionBox::StartMediaReplace(
 			controller,
 			item,
 			std::move(text),
+			spoilered,
+			invertCaption,
 			std::move(list),
 			std::move(saved)));
 	};
@@ -293,6 +299,8 @@ void EditCaptionBox::StartMediaReplace(
 		FullMsgId itemId,
 		Ui::PreparedList &&list,
 		TextWithTags text,
+		bool spoilered,
+		bool invertCaption,
 		Fn<void()> saved) {
 	const auto session = &controller->session();
 	const auto item = session->data().message(itemId);
@@ -326,6 +334,8 @@ void EditCaptionBox::StartMediaReplace(
 			controller,
 			item,
 			std::move(text),
+			spoilered,
+			invertCaption,
 			std::move(list),
 			std::move(saved)));
 	}
@@ -336,14 +346,15 @@ void EditCaptionBox::StartPhotoEdit(
 		std::shared_ptr<Data::PhotoMedia> media,
 		FullMsgId itemId,
 		TextWithTags text,
+		bool spoilered,
+		bool invertCaption,
 		Fn<void()> saved) {
 	const auto session = &controller->session();
 	const auto item = session->data().message(itemId);
 	if (!item) {
 		return;
 	}
-	const auto hasSpoiler = item->media() && item->media()->hasSpoiler();
-	EditPhotoImage(controller, media, hasSpoiler, [=](
+	EditPhotoImage(controller, media, spoilered, [=](
 			Ui::PreparedList &&list) mutable {
 		const auto item = session->data().message(itemId);
 		if (!item) {
@@ -353,6 +364,8 @@ void EditCaptionBox::StartPhotoEdit(
 			controller,
 			item,
 			std::move(text),
+			spoilered,
+			invertCaption,
 			std::move(list),
 			std::move(saved)));
 	});
@@ -363,10 +376,29 @@ void EditCaptionBox::prepare() {
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 
 	const auto details = crl::guard(this, [=] {
-		return SendMenu::Details();
+		auto result = SendMenu::Details();
+		const auto allWithSpoilers = ranges::all_of(
+			_preparedList.files,
+			&Ui::PreparedFile::spoiler);
+		result.spoiler = !_preparedList.hasSpoilerMenu(!_asFile)
+			? SendMenu::SpoilerState::None
+			: allWithSpoilers
+			? SendMenu::SpoilerState::Enabled
+			: SendMenu::SpoilerState::Possible;
+		const auto canMoveCaption = _preparedList.canMoveCaption(
+			false,
+			!_asFile
+		) && _field && HasSendText(_field);
+		result.caption = !canMoveCaption
+			? SendMenu::CaptionState::None
+			: _mediaEditManager.invertCaption()
+			? SendMenu::CaptionState::Above
+			: SendMenu::CaptionState::Below;
+		return result;
 	});
 	const auto callback = [=](SendMenu::Action action, const auto &) {
-
+		_mediaEditManager.apply(action);
+		rebuildPreview();
 	};
 	SendMenu::SetupMenuAndShortcuts(
 		button,
@@ -402,7 +434,6 @@ void EditCaptionBox::rebuildPreview() {
 
 	applyChanges();
 
-	_previewHasSpoiler = nullptr;
 	if (_preparedList.files.empty()) {
 		const auto media = _historyItem->media();
 		const auto photo = media->photo();
@@ -436,7 +467,13 @@ void EditCaptionBox::rebuildPreview() {
 		_isPhoto = (media && media->isPhoto());
 		const auto withCheckbox = _isPhoto && CanBeCompressed(_albumType);
 		if (media && (!withCheckbox || !_asFile)) {
-			_previewHasSpoiler = [media] { return media->hasSpoiler(); };
+			media->spoileredChanges(
+			) | rpl::start_with_next([=](bool spoilered) {
+				_mediaEditManager.apply({ .type = spoilered
+					? SendMenu::ActionType::SpoilerOn
+					: SendMenu::ActionType::SpoilerOff
+				});
+			}, media->lifetime());
 			_content.reset(media);
 		} else {
 			_content.reset(Ui::CreateChild<Ui::SingleFilePreview>(
@@ -763,10 +800,7 @@ bool EditCaptionBox::setPreparedList(Ui::PreparedList &&list) {
 }
 
 bool EditCaptionBox::hasSpoiler() const {
-	return _preparedList.files.empty()
-		? (_historyItem->media()
-			&& _historyItem->media()->hasSpoiler())
-		: _preparedList.files.front().spoiler;
+	return _mediaEditManager.spoilered();
 }
 
 void EditCaptionBox::captionResized() {
@@ -875,8 +909,8 @@ bool EditCaptionBox::validateLength(const QString &text) const {
 }
 
 void EditCaptionBox::applyChanges() {
-	if (!_preparedList.files.empty() && _previewHasSpoiler) {
-		_preparedList.files.front().spoiler = _previewHasSpoiler();
+	if (!_preparedList.files.empty()) {
+		_preparedList.files.front().spoiler = _mediaEditManager.spoilered();
 	}
 }
 
@@ -905,7 +939,7 @@ void EditCaptionBox::save() {
 	auto options = Api::SendOptions();
 	options.scheduled = item->isScheduled() ? item->date() : 0;
 	options.shortcutId = item->shortcutId();
-	//options.invertCaption = _invertCaption;
+	options.invertCaption = _mediaEditManager.invertCaption();
 
 	if (!_preparedList.files.empty()) {
 		if ((_albumType != Ui::AlbumType::None)
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.h b/Telegram/SourceFiles/boxes/edit_caption_box.h
index b3a10f43fb283..af72a250fee7a 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.h
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "history/view/controls/history_view_compose_media_edit_manager.h"
 #include "ui/layers/box_content.h"
 #include "ui/chat/attach/attach_prepare.h"
 
@@ -37,6 +38,8 @@ class EditCaptionBox final : public Ui::BoxContent {
 		not_null<Window::SessionController*> controller,
 		not_null<HistoryItem*> item,
 		TextWithTags &&text,
+		bool spoilered,
+		bool invertCaption,
 		Ui::PreparedList &&list,
 		Fn<void()> saved);
 	~EditCaptionBox();
@@ -45,18 +48,24 @@ class EditCaptionBox final : public Ui::BoxContent {
 		not_null<Window::SessionController*> controller,
 		FullMsgId itemId,
 		TextWithTags text,
+		bool spoilered,
+		bool invertCaption,
 		Fn<void()> saved);
 	static void StartMediaReplace(
 		not_null<Window::SessionController*> controller,
 		FullMsgId itemId,
 		Ui::PreparedList &&list,
 		TextWithTags text,
+		bool spoilered,
+		bool invertCaption,
 		Fn<void()> saved);
 	static void StartPhotoEdit(
 		not_null<Window::SessionController*> controller,
 		std::shared_ptr<Data::PhotoMedia> media,
 		FullMsgId itemId,
 		TextWithTags text,
+		bool spoilered,
+		bool invertCaption,
 		Fn<void()> saved);
 
 protected:
@@ -107,7 +116,6 @@ class EditCaptionBox final : public Ui::BoxContent {
 	const base::unique_qptr<Ui::EmojiButton> _emojiToggle;
 
 	base::unique_qptr<Ui::AbstractSinglePreview> _content;
-	Fn<bool()> _previewHasSpoiler;
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	base::unique_qptr<QObject> _emojiFilter;
 
@@ -118,6 +126,7 @@ class EditCaptionBox final : public Ui::BoxContent {
 	std::shared_ptr<Data::PhotoMedia> _photoMedia;
 
 	Ui::PreparedList _preparedList;
+	HistoryView::MediaEditManager _mediaEditManager;
 
 	mtpRequestId _saveRequestId = 0;
 
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 0656488eedba6..112e7543a8d7c 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -595,16 +595,7 @@ bool SendFilesBox::hasSendMenu(const SendMenu::Details &details) const {
 }
 
 bool SendFilesBox::hasSpoilerMenu() const {
-	const auto allAreVideo = !ranges::any_of(_list.files, [](const auto &f) {
-		using Type = Ui::PreparedFile::Type;
-		return (f.type != Type::Video);
-	});
-	const auto allAreMedia = !ranges::any_of(_list.files, [](const auto &f) {
-		using Type = Ui::PreparedFile::Type;
-		return (f.type != Type::Photo) && (f.type != Type::Video);
-	});
-	return allAreVideo
-		|| (allAreMedia && _sendWay.current().sendImagesAsPhotos());
+	return _list.hasSpoilerMenu(_sendWay.current().sendImagesAsPhotos());
 }
 
 void SendFilesBox::applyBlockChanges() {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index bcbada5720cd5..44c65a048e897 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -328,7 +328,7 @@ HistoryWidget::HistoryWidget(
 				|| action.type == ActionType::CaptionDown
 				|| action.type == ActionType::SpoilerOn
 				|| action.type == ActionType::SpoilerOff) {
-				_mediaEditSpoiler.apply(action);
+				_mediaEditManager.apply(action);
 			} else if (action.type == ActionType::Send) {
 				send(action.options);
 			} else {
@@ -2677,7 +2677,7 @@ void HistoryWidget::setEditMsgId(MsgId msgId) {
 	unregisterDraftSources();
 	_editMsgId = msgId;
 	if (!msgId) {
-		_mediaEditSpoiler.cancel();
+		_mediaEditManager.cancel();
 		_canReplaceMedia = false;
 		if (_preview) {
 			_preview->setDisabled(false);
@@ -2749,6 +2749,8 @@ bool HistoryWidget::updateReplaceMediaButton() {
 				controller(),
 				{ _history->peer->id, _editMsgId },
 				_field->getTextWithTags(),
+				_mediaEditManager.spoilered(),
+				_mediaEditManager.invertCaption(),
 				crl::guard(_list, [=] { cancelEdit(); }));
 		});
 	});
@@ -4065,10 +4067,10 @@ void HistoryWidget::saveEditMsg() {
 		item,
 		sending,
 		webPageDraft,
-		{ .invertCaption = _mediaEditSpoiler.invertCaption() },
+		{ .invertCaption = _mediaEditManager.invertCaption() },
 		done,
 		fail,
-		_mediaEditSpoiler.spoilered());
+		_mediaEditManager.spoilered());
 }
 
 void HistoryWidget::hideChildWidgets() {
@@ -4228,7 +4230,7 @@ SendMenu::Details HistoryWidget::sendMenuDetails() const {
 
 SendMenu::Details HistoryWidget::saveMenuDetails() const {
 	return (_editMsgId && _replyEditMsg)
-		? _mediaEditSpoiler.sendMenuDetails(HasSendText(_field))
+		? _mediaEditManager.sendMenuDetails(HasSendText(_field))
 		: SendMenu::Details();
 }
 
@@ -5613,6 +5615,8 @@ bool HistoryWidget::confirmSendingFiles(
 				{ _history->peer->id, _editMsgId },
 				std::move(list),
 				_field->getTextWithTags(),
+				_mediaEditManager.spoilered(),
+				_mediaEditManager.invertCaption(),
 				crl::guard(_list, [=] { cancelEdit(); }));
 			return true;
 		}
@@ -6599,7 +6603,7 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 	if (_editMsgId
 		&& (_inDetails || _inPhotoEdit)
 		&& (e->button() == Qt::RightButton)) {
-		_mediaEditSpoiler.showMenu(
+		_mediaEditManager.showMenu(
 			_list,
 			[=] { mouseMoveEvent(nullptr); },
 			HasSendText(_field));
@@ -6609,6 +6613,8 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 			_photoEditMedia,
 			{ _history->peer->id, _editMsgId },
 			_field->getTextWithTags(),
+			_mediaEditManager.spoilered(),
+			_mediaEditManager.invertCaption(),
 			crl::guard(_list, [=] { cancelEdit(); }));
 	} else if (!_inDetails) {
 		return;
@@ -8186,7 +8192,7 @@ void HistoryWidget::updateReplyEditTexts(bool force) {
 			? _replyEditMsg->media()
 			: nullptr;
 		if (_editMsgId && _replyEditMsg) {
-			_mediaEditSpoiler.start(_replyEditMsg);
+			_mediaEditManager.start(_replyEditMsg);
 		}
 		_canReplaceMedia = editMedia && editMedia->allowsEditMedia();
 		_photoEditMedia = (_canReplaceMedia
@@ -8281,12 +8287,12 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 		? drawMsgText->media()
 		: nullptr;
 	const auto hasPreview = media && media->hasReplyPreview();
-	const auto preview = _mediaEditSpoiler
-		? _mediaEditSpoiler.mediaPreview()
+	const auto preview = _mediaEditManager
+		? _mediaEditManager.mediaPreview()
 		: hasPreview
 		? media->replyPreview()
 		: nullptr;
-	const auto spoilered = _mediaEditSpoiler.spoilered();
+	const auto spoilered = _mediaEditManager.spoilered();
 	if (!spoilered) {
 		_replySpoiler = nullptr;
 	} else if (!_replySpoiler) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index f829cf7975f66..e9453a6214ba8 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -661,7 +661,7 @@ class HistoryWidget final
 	MsgId _editMsgId = 0;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
 	bool _canReplaceMedia = false;
-	HistoryView::MediaEditSpoilerManager _mediaEditSpoiler;
+	HistoryView::MediaEditManager _mediaEditManager;
 
 	HistoryItem *_replyEditMsg = nullptr;
 	Ui::Text::String _replyEditMsgText;
diff --git a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
index 01237072b6fcc..e51bae134d640 100644
--- a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
+++ b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
@@ -21,7 +21,7 @@ struct MessageToEdit {
 	FullMsgId fullId;
 	Api::SendOptions options;
 	TextWithTags textWithTags;
-	std::optional<bool> spoilerMediaOverride;
+	bool spoilered = false;
 };
 struct VoiceToSend {
 	QByteArray bytes;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 6c985bbf07bcb..ac381222cd283 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -216,7 +216,7 @@ class FieldHeader final : public Ui::RpWidget {
 	bool _repaintScheduled : 1 = false;
 	bool _inClickable : 1 = false;
 
-	HistoryView::MediaEditSpoilerManager _mediaEditSpoiler;
+	HistoryView::MediaEditManager _mediaEditManager;
 
 	const not_null<Data::Session*> _data;
 	const not_null<Ui::IconButton*> _cancel;
@@ -409,7 +409,7 @@ void FieldHeader::init() {
 				}
 			} else if (!isLeftButton) {
 				if (inPreviewRect && isEditingMessage()) {
-					_mediaEditSpoiler.showMenu(
+					_mediaEditManager.showMenu(
 						this,
 						[=] { update(); },
 						_hasSendText());
@@ -587,12 +587,12 @@ void FieldHeader::paintEditOrReplyToMessage(Painter &p) {
 
 	const auto media = _shownMessage->media();
 	_shownMessageHasPreview = media && media->hasReplyPreview();
-	const auto preview = _mediaEditSpoiler
-		? _mediaEditSpoiler.mediaPreview()
+	const auto preview = _mediaEditManager
+		? _mediaEditManager.mediaPreview()
 		: _shownMessageHasPreview
 		? media->replyPreview()
 		: nullptr;
-	const auto spoilered = _mediaEditSpoiler.spoilered();
+	const auto spoilered = _mediaEditManager.spoilered();
 	if (!spoilered) {
 		_shownPreviewSpoiler = nullptr;
 	} else if (!_shownPreviewSpoiler) {
@@ -737,7 +737,7 @@ void FieldHeader::editMessage(FullMsgId id, bool photoEditAllowed) {
 	_photoEditAllowed = photoEditAllowed;
 	_editMsgId = id;
 	if (!photoEditAllowed) {
-		_mediaEditSpoiler.cancel();
+		_mediaEditManager.cancel();
 		_inPhotoEdit = false;
 		_inPhotoEditOver.stop();
 	}
@@ -784,9 +784,9 @@ MessageToEdit FieldHeader::queryToEdit() {
 		.options = {
 			.scheduled = item->isScheduled() ? item->date() : 0,
 			.shortcutId = item->shortcutId(),
-			.invertCaption = _mediaEditSpoiler.invertCaption(),
+			.invertCaption = _mediaEditManager.invertCaption(),
 		},
-		.spoilerMediaOverride = _mediaEditSpoiler.spoilered(),
+		.spoilered = _mediaEditManager.spoilered(),
 	};
 }
 
@@ -1138,11 +1138,14 @@ bool ComposeControls::confirmMediaEdit(Ui::PreparedList &list) {
 	if (!isEditingMessage() || !_regularWindow) {
 		return false;
 	} else if (_canReplaceMedia) {
+		const auto queryToEdit = _header->queryToEdit();
 		EditCaptionBox::StartMediaReplace(
 			_regularWindow,
 			_editingId,
 			std::move(list),
 			_field->getTextWithTags(),
+			queryToEdit.spoilered,
+			queryToEdit.options.invertCaption,
 			crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
 	} else {
 		_show->showToast(tr::lng_edit_caption_attach(tr::now));
@@ -1401,11 +1404,14 @@ void ComposeControls::init() {
 
 	_header->editPhotoRequests(
 	) | rpl::start_with_next([=] {
+		const auto queryToEdit = _header->queryToEdit();
 		EditCaptionBox::StartPhotoEdit(
 			_regularWindow,
 			_photoEditMedia,
 			_editingId,
 			_field->getTextWithTags(),
+			queryToEdit.spoilered,
+			queryToEdit.options.invertCaption,
 			crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
 	}, _wrap->lifetime());
 
@@ -2943,10 +2949,13 @@ bool ComposeControls::updateReplaceMediaButton() {
 	const auto hideDuration = st::historyReplaceMedia.ripple.hideDuration;
 	_replaceMedia->setClickedCallback([=] {
 		base::call_delayed(hideDuration, _wrap.get(), [=] {
+			const auto queryToEdit = _header->queryToEdit();
 			EditCaptionBox::StartMediaReplace(
 				_regularWindow,
 				_editingId,
 				_field->getTextWithTags(),
+				queryToEdit.spoilered,
+				queryToEdit.options.invertCaption,
 				crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
 		});
 	});
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 f20681a0fcc56..dd2fa98937435 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
@@ -21,16 +21,19 @@ For license and copyright information please follow this link:
 
 namespace HistoryView {
 
-MediaEditSpoilerManager::MediaEditSpoilerManager() = default;
+MediaEditManager::MediaEditManager() = default;
 
-void MediaEditSpoilerManager::start(not_null<HistoryItem*> item) {
+void MediaEditManager::start(
+		not_null<HistoryItem*> item,
+		std::optional<bool> spoilered,
+		std::optional<bool> invertCaption) {
 	const auto media = item->media();
 	if (!media) {
 		return;
 	}
 	_item = item;
-	_spoilered = media->hasSpoiler();
-	_invertCaption = item->invertMedia();
+	_spoilered = spoilered.value_or(media->hasSpoiler());
+	_invertCaption = invertCaption.value_or(item->invertMedia());
 	_lifetime = item->history()->owner().itemRemoved(
 	) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
 		if (removed == _item) {
@@ -39,7 +42,7 @@ void MediaEditSpoilerManager::start(not_null<HistoryItem*> item) {
 	});
 }
 
-void MediaEditSpoilerManager::apply(SendMenu::Action action) {
+void MediaEditManager::apply(SendMenu::Action action) {
 	using Type = SendMenu::Action::Type;
 	if (action.type == Type::CaptionUp) {
 		_invertCaption = true;
@@ -52,13 +55,13 @@ void MediaEditSpoilerManager::apply(SendMenu::Action action) {
 	}
 }
 
-void MediaEditSpoilerManager::cancel() {
+void MediaEditManager::cancel() {
 	_menu = nullptr;
 	_item = nullptr;
 	_lifetime.destroy();
 }
 
-void MediaEditSpoilerManager::showMenu(
+void MediaEditManager::showMenu(
 		not_null<Ui::RpWidget*> parent,
 		Fn<void()> finished,
 		bool hasCaptionText) {
@@ -88,7 +91,7 @@ void MediaEditSpoilerManager::showMenu(
 	_menu->popup(position);
 }
 
-[[nodiscard]] Image *MediaEditSpoilerManager::mediaPreview() {
+Image *MediaEditManager::mediaPreview() {
 	if (const auto media = _item ? _item->media() : nullptr) {
 		if (const auto photo = media->photo()) {
 			return photo->getReplyPreview(
@@ -105,15 +108,15 @@ void MediaEditSpoilerManager::showMenu(
 	return nullptr;
 }
 
-bool MediaEditSpoilerManager::spoilered() const {
+bool MediaEditManager::spoilered() const {
 	return _spoilered;
 }
 
-bool MediaEditSpoilerManager::invertCaption() const {
+bool MediaEditManager::invertCaption() const {
 	return _invertCaption;
 }
 
-SendMenu::Details MediaEditSpoilerManager::sendMenuDetails(
+SendMenu::Details MediaEditManager::sendMenuDetails(
 		bool hasCaptionText) const {
 	const auto media = _item ? _item->media() : nullptr;
 	if (!media) {
@@ -122,10 +125,12 @@ SendMenu::Details MediaEditSpoilerManager::sendMenuDetails(
 	const auto editingMedia = media->allowsEditMedia();
 	const auto editPhoto = editingMedia ? media->photo() : nullptr;
 	const auto editDocument = editingMedia ? media->document() : nullptr;
-	const auto canSaveSpoiler = (editPhoto && !editPhoto->isNull())
-		|| (editDocument
+	const auto canSaveSpoiler = CanBeSpoilered(_item);
+	const auto canMoveCaption = media->allowsEditCaption()
+		&& hasCaptionText
+		&& (editPhoto
+			|| editDocument
 			&& (editDocument->isVideoFile() || editDocument->isGifv()));
-	const auto canMoveCaption = media->allowsEditCaption() && hasCaptionText;
 	return {
 		.spoiler = (!canSaveSpoiler
 			? SendMenu::SpoilerState::None
@@ -140,4 +145,14 @@ SendMenu::Details MediaEditSpoilerManager::sendMenuDetails(
 	};
 }
 
+bool MediaEditManager::CanBeSpoilered(not_null<HistoryItem*> item) {
+	const auto media = item ? item->media() : nullptr;
+	const auto editingMedia = media && media->allowsEditMedia();
+	const auto editPhoto = editingMedia ? media->photo() : nullptr;
+	const auto editDocument = editingMedia ? media->document() : nullptr;
+	return (editPhoto && !editPhoto->isNull())
+		|| (editDocument
+			&& (editDocument->isVideoFile() || editDocument->isGifv()));
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h
index 0f9f49e2b2a30..0ca33f854ca15 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.h
@@ -24,11 +24,14 @@ class HistoryItem;
 
 namespace HistoryView {
 
-class MediaEditSpoilerManager final {
+class MediaEditManager final {
 public:
-	MediaEditSpoilerManager();
+	MediaEditManager();
 
-	void start(not_null<HistoryItem*> item);
+	void start(
+		not_null<HistoryItem*> item,
+		std::optional<bool> spoilered = {},
+		std::optional<bool> invertCaption = {});
 	void apply(SendMenu::Action action);
 	void cancel();
 
@@ -49,6 +52,8 @@ class MediaEditSpoilerManager final {
 		return _item != nullptr;
 	}
 
+	[[nodiscard]] static bool CanBeSpoilered(not_null<HistoryItem*> item);
+
 private:
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	HistoryItem *_item = nullptr;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 7f7ded51abd27..27ff0e4ff66c8 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -740,7 +740,7 @@ void RepliesWidget::setupComposeControls() {
 	_composeControls->editRequests(
 	) | rpl::start_with_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
-			const auto spoiler = data.spoilerMediaOverride;
+			const auto spoiler = data.spoilered;
 			edit(item, data.options, saveEditMsgRequestId, spoiler);
 		}
 	}, lifetime());
@@ -1213,7 +1213,7 @@ void RepliesWidget::edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
 		mtpRequestId *const saveEditMsgRequestId,
-		std::optional<bool> spoilerMediaOverride) {
+		bool spoilered) {
 	if (*saveEditMsgRequestId) {
 		return;
 	}
@@ -1282,7 +1282,7 @@ void RepliesWidget::edit(
 		options,
 		crl::guard(this, done),
 		crl::guard(this, fail),
-		spoilerMediaOverride);
+		spoilered);
 
 	_composeControls->hidePanelsAnimated();
 	doSetInnerFocus();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 54f02ef169365..37c8540fdefba 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -247,7 +247,7 @@ class RepliesWidget final
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
 		mtpRequestId *const saveEditMsgRequestId,
-		std::optional<bool> spoilerMediaOverride);
+		bool spoilered);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
 	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
 	[[nodiscard]] FullReplyTo replyTo() const;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 6535958beab0c..bd4a1123b65dc 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -320,7 +320,7 @@ void ScheduledWidget::setupComposeControls() {
 	) | rpl::start_with_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
 			if (item->isScheduled()) {
-				const auto spoiler = data.spoilerMediaOverride;
+				const auto spoiler = data.spoilered;
 				edit(item, data.options, saveEditMsgRequestId, spoiler);
 			}
 		}
@@ -733,7 +733,7 @@ void ScheduledWidget::edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
 		mtpRequestId *const saveEditMsgRequestId,
-		std::optional<bool> spoilerMediaOverride) {
+		bool spoilered) {
 	if (*saveEditMsgRequestId) {
 		return;
 	}
@@ -802,7 +802,7 @@ void ScheduledWidget::edit(
 		options,
 		crl::guard(this, done),
 		crl::guard(this, fail),
-		spoilerMediaOverride);
+		spoilered);
 
 	_composeControls->hidePanelsAnimated();
 	_composeControls->focus();
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index e79304691915b..b2b0efa41d4fc 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -218,7 +218,7 @@ class ScheduledWidget final
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
 		mtpRequestId *const saveEditMsgRequestId,
-		std::optional<bool> spoilerMediaOverride);
+		bool spoilered);
 	void highlightSingleNewMessage(const Data::MessagesSlice &slice);
 	void chooseAttach();
 	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index ccbb1aea2b914..96c6cb8418d2f 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -240,7 +240,7 @@ class ShortcutMessages
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
 		mtpRequestId *const saveEditMsgRequestId,
-		std::optional<bool> spoilerMediaOverride);
+		bool spoilered);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
 	[[nodiscard]] FullReplyTo replyTo() const;
 	void doSetInnerFocus();
@@ -675,7 +675,7 @@ void ShortcutMessages::setupComposeControls() {
 	) | rpl::start_with_next([=](auto data) {
 		if (const auto item = _session->data().message(data.fullId)) {
 			if (item->isBusinessShortcut()) {
-				const auto spoiler = data.spoilerMediaOverride;
+				const auto spoiler = data.spoilered;
 				edit(item, data.options, saveEditMsgRequestId, spoiler);
 			}
 		}
@@ -1221,7 +1221,7 @@ void ShortcutMessages::edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
 		mtpRequestId *const saveEditMsgRequestId,
-		std::optional<bool> spoilerMediaOverride) {
+		bool spoilered) {
 	if (*saveEditMsgRequestId) {
 		return;
 	}
@@ -1290,7 +1290,7 @@ void ShortcutMessages::edit(
 		options,
 		crl::guard(this, done),
 		crl::guard(this, fail),
-		spoilerMediaOverride);
+		spoilered);
 
 	_composeControls->hidePanelsAnimated();
 	doSetInnerFocus();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp
index 29f38cddeea3e..01b94a9d130bd 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp
@@ -78,6 +78,10 @@ bool AbstractSingleMediaPreview::canHaveSpoiler() const {
 	return supportsSpoilers();
 }
 
+rpl::producer<bool> AbstractSingleMediaPreview::spoileredChanges() const {
+	return _spoileredChanges.events();
+}
+
 void AbstractSingleMediaPreview::preparePreview(QImage preview) {
 	auto maxW = 0;
 	auto maxH = 0;
@@ -275,6 +279,7 @@ void AbstractSingleMediaPreview::showContextMenu(QPoint position) {
 		? tr::lng_context_disable_spoiler(tr::now)
 		: tr::lng_context_spoiler_effect(tr::now), [=] {
 		setSpoiler(!spoilered);
+		_spoileredChanges.fire_copy(!spoilered);
 	}, spoilered ? &icons.menuSpoilerOff : &icons.menuSpoiler);
 
 	if (_menu->empty()) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h
index 9018151366867..0f5f8e7841461 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h
@@ -41,6 +41,7 @@ class AbstractSingleMediaPreview : public AbstractSinglePreview {
 	void setSpoiler(bool spoiler);
 	[[nodiscard]] bool hasSpoiler() const;
 	[[nodiscard]] bool canHaveSpoiler() const;
+	[[nodiscard]] rpl::producer<bool> spoileredChanges() const;
 
 protected:
 	virtual bool supportsSpoilers() const = 0;
@@ -79,6 +80,7 @@ class AbstractSingleMediaPreview : public AbstractSinglePreview {
 	int _previewHeight = 0;
 
 	std::unique_ptr<SpoilerAnimation> _spoiler;
+	rpl::event_stream<bool> _spoileredChanges;
 
 	const int _minThumbH;
 	const base::unique_qptr<AttachControlsWidget> _controls;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index ebdf9ac6f7c69..1a70c69b6de8a 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -237,6 +237,18 @@ bool PreparedList::hasSticker() const {
 	return ranges::any_of(files, &PreparedFile::isSticker);
 }
 
+bool PreparedList::hasSpoilerMenu(bool compress) const {
+	const auto allAreVideo = !ranges::any_of(files, [](const auto &f) {
+		using Type = Ui::PreparedFile::Type;
+		return (f.type != Type::Video);
+	});
+	const auto allAreMedia = !ranges::any_of(files, [](const auto &f) {
+		using Type = Ui::PreparedFile::Type;
+		return (f.type != Type::Photo) && (f.type != Type::Video);
+	});
+	return allAreVideo || (allAreMedia && compress);
+}
+
 int MaxAlbumItems() {
 	return kMaxAlbumCount;
 }
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index e467cc61163db..30210e3d62042 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -123,6 +123,7 @@ struct PreparedList {
 	[[nodiscard]] bool hasSendImagesAsPhotosOption(bool slowmode) const;
 	[[nodiscard]] bool canHaveEditorHintLabel() const;
 	[[nodiscard]] bool hasSticker() const;
+	[[nodiscard]] bool hasSpoilerMenu(bool compress) const;
 
 	Error error = Error::None;
 	QString errorData;

From 40fbd415ef8a4d0c287a5fadf379bdb7699edd44 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 15:05:13 +0400
Subject: [PATCH 285/400] Support collapsible blockquotes in Ui::Text::String.

---
 Telegram/CMakeLists.txt                           |  4 ++--
 Telegram/SourceFiles/api/api_text_entities.cpp    |  8 +++++++-
 .../SourceFiles/chat_helpers/message_field.cpp    |  3 ++-
 Telegram/SourceFiles/data/data_session.cpp        | 15 +++++++++++----
 .../SourceFiles/export/data/export_data_types.cpp |  2 ++
 .../export/output/export_output_json.cpp          |  4 ++++
 .../history/view/history_view_element.cpp         | 10 ++++++++--
 .../history/view/history_view_element.h           |  1 +
 ...k_handler.cpp => history_view_text_helper.cpp} | 14 ++++++++++----
 ...click_handler.h => history_view_text_helper.h} |  4 +---
 .../history/view/media/history_view_document.cpp  |  8 ++++++--
 .../history/view/media/history_view_media.cpp     |  4 ++--
 .../view/media/history_view_media_grouped.cpp     |  8 +++++++-
 .../history/view/media/history_view_web_page.cpp  | 15 +++++++++------
 Telegram/SourceFiles/ui/chat/chat.style           | 13 +++++++++++--
 Telegram/lib_ui                                   |  2 +-
 16 files changed, 84 insertions(+), 31 deletions(-)
 rename Telegram/SourceFiles/history/view/{history_view_spoiler_click_handler.cpp => history_view_text_helper.cpp} (68%)
 rename Telegram/SourceFiles/history/view/{history_view_spoiler_click_handler.h => history_view_text_helper.h} (78%)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 6e786a6cdda1c..fa06b446a675b 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -837,14 +837,14 @@ PRIVATE
     history/view/history_view_send_action.h
     history/view/history_view_service_message.cpp
     history/view/history_view_service_message.h
-    history/view/history_view_spoiler_click_handler.cpp
-    history/view/history_view_spoiler_click_handler.h
     history/view/history_view_sponsored_click_handler.cpp
     history/view/history_view_sponsored_click_handler.h
     history/view/history_view_sticker_toast.cpp
     history/view/history_view_sticker_toast.h
     history/view/history_view_sublist_section.cpp
     history/view/history_view_sublist_section.h
+    history/view/history_view_text_helper.cpp
+    history/view/history_view_text_helper.h
     history/view/history_view_transcribe_button.cpp
     history/view/history_view_transcribe_button.h
     history/view/history_view_translate_bar.cpp
diff --git a/Telegram/SourceFiles/api/api_text_entities.cpp b/Telegram/SourceFiles/api/api_text_entities.cpp
index 3c5098911b384..93d5cc5f36a70 100644
--- a/Telegram/SourceFiles/api/api_text_entities.cpp
+++ b/Telegram/SourceFiles/api/api_text_entities.cpp
@@ -217,6 +217,7 @@ EntitiesInText EntitiesFromMTP(
 				EntityType::Blockquote,
 				d.voffset().v,
 				d.vlength().v,
+				d.is_collapsed() ? u"1"_q : QString(),
 			});
 		});
 	}
@@ -311,8 +312,13 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 					MTP_string(entity.data())));
 		} break;
 		case EntityType::Blockquote: {
+			using Flag = MTPDmessageEntityBlockquote::Flag;
+			const auto collapsed = !entity.data().isEmpty();
 			v.push_back(
-				MTP_messageEntityBlockquote(MTP_flags(0), offset, length));
+				MTP_messageEntityBlockquote(
+					MTP_flags(collapsed ? Flag::f_collapsed : Flag()),
+					offset,
+					length));
 		} break;
 		case EntityType::Spoiler: {
 			v.push_back(MTP_messageEntitySpoiler(offset, length));
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 836459ad8a2ce..8b5f3c373f6ea 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -748,7 +748,8 @@ void MessageLinksParser::parse() {
 			|| (tag == Ui::InputField::kTagUnderline)
 			|| (tag == Ui::InputField::kTagStrikeOut)
 			|| (tag == Ui::InputField::kTagSpoiler)
-			|| (tag == Ui::InputField::kTagBlockquote);
+			|| (tag == Ui::InputField::kTagBlockquote)
+			|| (tag == Ui::InputField::kTagBlockquoteCollapsed);
 	};
 
 	_ranges.clear();
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 529b933d4bd94..dba1c3d6952c8 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1820,12 +1820,19 @@ rpl::producer<not_null<HistoryItem*>> Session::itemDataChanges() const {
 }
 
 void Session::requestItemTextRefresh(not_null<HistoryItem*> item) {
-	if (const auto i = _views.find(item); i != _views.end()) {
-		for (const auto &view : i->second) {
-			view->itemTextUpdated();
+	const auto call = [&](not_null<HistoryItem*> item) {
+		if (const auto i = _views.find(item); i != _views.end()) {
+			for (const auto &view : i->second) {
+				view->itemTextUpdated();
+			}
 		}
-		requestItemResize(item);
+	};
+	if (const auto group = groups().find(item)) {
+		call(group->items.front());
+	} else {
+		call(item);
 	}
+	requestItemResize(item);
 }
 
 void Session::registerHighlightProcess(
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index c4b55f346456a..71750a5756e16 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -307,6 +307,8 @@ std::vector<TextPart> ParseText(
 			return NumberToString(data.vuser_id().v);
 		}, [](const MTPDmessageEntityCustomEmoji &data) {
 			return NumberToString(data.vdocument_id().v);
+		}, [](const MTPDmessageEntityBlockquote &data) {
+			return data.is_collapsed() ? Utf8String("1") : Utf8String();
 		}, [](const auto &) { return Utf8String(); });
 
 		result.push_back(std::move(part));
diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp
index 67814e5b20884..b485e615b2021 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_json.cpp
@@ -195,6 +195,8 @@ QByteArray SerializeText(
 			? "language"
 			: (part.type == Type::TextUrl)
 			? "href"
+			: (part.type == Type::Blockquote)
+			? "collapsed"
 			: "none";
 		const auto additionalValue = (part.type == Type::MentionName)
 			? part.additional
@@ -202,6 +204,8 @@ QByteArray SerializeText(
 				|| part.type == Type::TextUrl
 				|| part.type == Type::CustomEmoji)
 			? SerializeString(part.additional)
+			: (part.type == Type::Blockquote)
+			? (part.additional.isEmpty() ? "false" : "true")
 			: QByteArray();
 		return SerializeObject(context, {
 			{ "type", SerializeString(typeString) },
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 3cdb44ed00a30..df32ee082f84f 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -18,7 +18,7 @@ For license and copyright information please follow this link:
 #include "history/view/reactions/history_view_reactions.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_reply.h"
-#include "history/view/history_view_spoiler_click_handler.h"
+#include "history/view/history_view_text_helper.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
@@ -1027,7 +1027,7 @@ void Element::setTextWithLinks(
 			refreshMedia(nullptr);
 		}
 	}
-	FillTextWithAnimatedSpoilers(this, _text);
+	InitElementTextPart(this, _text);
 	_textWidth = -1;
 	_textHeight = 0;
 }
@@ -1464,6 +1464,12 @@ void Element::itemTextUpdated() {
 	}
 }
 
+void Element::blockquoteExpandChanged() {
+	_textWidth = -1;
+	_textHeight = 0;
+	history()->owner().requestViewResize(this);
+}
+
 void Element::unloadHeavyPart() {
 	history()->owner().unregisterHeavyViewPart(this);
 	if (_media) {
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index fdac9a58385ac..0c01e97672260 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -498,6 +498,7 @@ class Element
 
 	virtual void itemDataChanged();
 	void itemTextUpdated();
+	void blockquoteExpandChanged();
 
 	[[nodiscard]] virtual bool hasHeavyPart() const;
 	virtual void unloadHeavyPart();
diff --git a/Telegram/SourceFiles/history/view/history_view_spoiler_click_handler.cpp b/Telegram/SourceFiles/history/view/history_view_text_helper.cpp
similarity index 68%
rename from Telegram/SourceFiles/history/view/history_view_spoiler_click_handler.cpp
rename to Telegram/SourceFiles/history/view/history_view_text_helper.cpp
index eb72db0f23075..fbe97ed567ae1 100644
--- a/Telegram/SourceFiles/history/view/history_view_spoiler_click_handler.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_text_helper.cpp
@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "history/view/history_view_spoiler_click_handler.h"
+#include "history/view/history_view_text_helper.h"
 
 #include "data/data_session.h"
 #include "history/view/history_view_element.h"
@@ -15,9 +15,7 @@ For license and copyright information please follow this link:
 
 namespace HistoryView {
 
-void FillTextWithAnimatedSpoilers(
-		not_null<Element*> view,
-		Ui::Text::String &text) {
+void InitElementTextPart(not_null<Element*> view, Ui::Text::String &text) {
 	if (text.hasSpoilers()) {
 		text.setSpoilerLinkFilter([weak = base::make_weak(view)](
 				const ClickContext &context) {
@@ -30,6 +28,14 @@ void FillTextWithAnimatedSpoilers(
 			return true;
 		});
 	}
+	if (text.hasCollapsedBlockquots()) {
+		const auto weak = base::make_weak(view);
+		text.setBlockquoteExpandCallback([=](int quoteIndex, bool expanded) {
+			if (const auto view = weak.get()) {
+				view->blockquoteExpandChanged();
+			}
+		});
+	}
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_spoiler_click_handler.h b/Telegram/SourceFiles/history/view/history_view_text_helper.h
similarity index 78%
rename from Telegram/SourceFiles/history/view/history_view_spoiler_click_handler.h
rename to Telegram/SourceFiles/history/view/history_view_text_helper.h
index 3bef398b61ee1..d7a604b53c0a5 100644
--- a/Telegram/SourceFiles/history/view/history_view_spoiler_click_handler.h
+++ b/Telegram/SourceFiles/history/view/history_view_text_helper.h
@@ -11,8 +11,6 @@ namespace HistoryView {
 
 class Element;
 
-void FillTextWithAnimatedSpoilers(
-	not_null<Element*> view,
-	Ui::Text::String &text);
+void InitElementTextPart(not_null<Element*> view, Ui::Text::String &text);
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index e415264b3bd6f..b1c9720538f2f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -1490,8 +1490,12 @@ QMargins Document::bubbleMargins() const {
 }
 
 void Document::refreshCaption(bool last) {
+	const auto now = Get<HistoryDocumentCaptioned>();
 	auto caption = createCaption();
 	if (!caption.isEmpty()) {
+		if (now) {
+			return;
+		}
 		AddComponents(HistoryDocumentCaptioned::Bit());
 		auto captioned = Get<HistoryDocumentCaptioned>();
 		captioned->caption = std::move(caption);
@@ -1503,7 +1507,7 @@ void Document::refreshCaption(bool last) {
 		} else {
 			captioned->caption.removeSkipBlock();
 		}
-	} else {
+	} else if (now) {
 		RemoveComponents(HistoryDocumentCaptioned::Bit());
 	}
 }
@@ -1637,7 +1641,7 @@ void Document::refreshParentId(not_null<HistoryItem*> realParent) {
 }
 
 void Document::parentTextUpdated() {
-	history()->owner().requestViewResize(_parent);
+	RemoveComponents(HistoryDocumentCaptioned::Bit());
 }
 
 void Document::hideSpoilers() {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index 65c2091537717..4f8c8096b9703 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -11,7 +11,7 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
-#include "history/view/history_view_spoiler_click_handler.h"
+#include "history/view/history_view_text_helper.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/media/history_view_media_spoiler.h"
 #include "storage/storage_shared_media.h"
@@ -319,7 +319,7 @@ Ui::Text::String Media::createCaption(not_null<HistoryItem*> item) const {
 		item->translatedTextWithLocalEntities(),
 		Ui::ItemTextOptions(item),
 		context);
-	FillTextWithAnimatedSpoilers(_parent, result);
+	InitElementTextPart(_parent, result);
 	if (const auto width = _parent->skipBlockWidth()) {
 		result.updateSkipBlock(width, _parent->skipBlockHeight());
 	}
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 c4e51f1745995..b1c8ba33d8339 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -781,7 +781,13 @@ void GroupedMedia::unloadHeavyPart() {
 
 void GroupedMedia::parentTextUpdated() {
 	if (_parent->media() == this) {
-		_captionItem = std::nullopt;
+		if (_mode == Mode::Column) {
+			for (const auto &part : _parts) {
+				part.content->parentTextUpdated();
+			}
+		} else {
+			_captionItem = std::nullopt;
+		}
 	}
 }
 
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 0275ed2c26ac5..44863dd41f861 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -282,7 +282,9 @@ WebPage::WebPage(
 	not_null<WebPageData*> data,
 	MediaWebPageFlags flags)
 : Media(parent)
-, _st(st::historyPagePreview)
+, _st(data->type == WebPageType::Factcheck
+	? st::factcheckPage
+	: st::historyPagePreview)
 , _data(data)
 , _flags(flags)
 , _siteName(st::msgMinWidth - _st.padding.left() - _st.padding.right())
@@ -859,13 +861,14 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			FillBackgroundEmoji(p, outer, false, *backgroundEmojiCache);
 		}
 	} else if (factcheck && factcheck->expandable) {
-		const auto &icon = factcheck->expanded
-			? st::factcheckIconCollapse
-			: st::factcheckIconExpand;
+		const auto &icon = factcheck->expanded ? _st.collapse : _st.expand;
+		const auto &position = factcheck->expanded
+			? _st.collapsePosition
+			: _st.expandPosition;
 		icon.paint(
 			p,
-			outer.x() + outer.width() - icon.width() - _st.padding.right(),
-			outer.y() + _st.padding.top(),
+			outer.x() + outer.width() - icon.width() - position.x(),
+			outer.y() + outer.height() - icon.height() - position.y(),
 			width());
 	}
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 3069b6f907e6e..622ba8357cda7 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -66,6 +66,10 @@ messageTextStyle: TextStyle(defaultTextStyle) {
 		padding: margins(10px, 2px, 20px, 2px);
 		icon: icon{{ "chat/mini_quote", windowFg }};
 		iconPosition: point(4px, 4px);
+		expand: icon{{ "intro_country_dropdown", windowFg }};
+		expandPosition: point(6px, 4px);
+		collapse: icon{{ "intro_country_dropdown-flip_vertical", windowFg }};
+		collapsePosition: point(6px, 4px);
 	}
 	pre: QuoteStyle(messageQuoteStyle) {
 		header: 20px;
@@ -1137,8 +1141,13 @@ factcheckFooterSkip: 16px;
 factcheckFooterStyle: TextStyle(defaultTextStyle) {
 	font: font(11px);
 }
-factcheckIconExpand: icon {{ "fast_to_original-rotate_cw", historyPeer1NameFg }};
-factcheckIconCollapse: icon {{ "fast_to_original-rotate_ccw", historyPeer1NameFg }};
+factcheckPage: QuoteStyle(historyPagePreview) {
+	padding: margins(10px, 5px, 22px, 7px);
+	expand: icon {{ "intro_country_dropdown", historyPeer1NameFg }};
+	expandPosition: point(6px, 4px);
+	collapse: icon {{ "intro_country_dropdown-flip_vertical", historyPeer1NameFg }};
+	collapsePosition: point(6px, 4px);
+}
 factcheckField: InputField(defaultInputField) {
 	textBg: transparent;
 	textMargins: margins(0px, 0px, 0px, 4px);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 0835adcc2d3cb..495ea0af50da4 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 0835adcc2d3cb1f2cf0d3630f6d95485864621f9
+Subproject commit 495ea0af50da469fb30769ac2d78251e4279a746

From 4df5372dab24d5d459c8a14f1059dd96e5b761e1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 22:33:24 +0400
Subject: [PATCH 286/400] Support chat preview on touchscreens.

---
 .../dialogs/dialogs_inner_widget.cpp          | 44 +++++++++++++++++++
 .../dialogs/dialogs_inner_widget.h            |  8 ++++
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 13 ++++++
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  1 +
 Telegram/lib_ui                               |  2 +-
 5 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index f90993a19edb4..7633e4d2f73e1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1316,6 +1316,9 @@ void InnerWidget::paintSearchInTopic(
 }
 
 void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
+	if (_chatPreviewTouchGlobal) {
+		return;
+	}
 	const auto globalPosition = e->globalPos();
 	if (!_lastMousePosition) {
 		_lastMousePosition = globalPosition;
@@ -1333,6 +1336,8 @@ void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
 void InnerWidget::cancelChatPreview() {
 	_chatPreviewTimer.cancel();
 	_chatPreviewWillBeFor = {};
+	_chatPreviewTouchLocal = {};
+	_chatPreviewTouchGlobal = {};
 }
 
 void InnerWidget::clearIrrelevantState() {
@@ -2396,10 +2401,14 @@ void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 
 void InnerWidget::showChatPreview(bool onlyUserpic) {
 	const auto key = base::take(_chatPreviewWillBeFor);
+	const auto touchGlobal = base::take(_chatPreviewTouchGlobal);
 	cancelChatPreview();
 	if (!pressShowsPreview(onlyUserpic) || key != computeChatPreviewRow()) {
 		return;
 	}
+	if (onlyUserpic && touchGlobal) {
+		_touchCancelRequests.fire({});
+	}
 	ClickHandler::unpressed();
 	mousePressReleased(QCursor::pos(), Qt::NoButton, Qt::NoModifier);
 
@@ -2538,6 +2547,41 @@ void InnerWidget::parentGeometryChanged() {
 	}
 }
 
+void InnerWidget::processTouchEvent(not_null<QTouchEvent*> e) {
+	const auto point = e->touchPoints().empty()
+		? std::optional<QPoint>()
+		: e->touchPoints().front().screenPos().toPoint();
+	switch (e->type()) {
+	case QEvent::TouchBegin: {
+		if (!point) {
+			return;
+		}
+		selectByMouse(*point);
+		const auto onlyUserpic = true;
+		if (pressShowsPreview(onlyUserpic)) {
+			_chatPreviewTouchGlobal = point;
+			_chatPreviewWillBeFor = computeChatPreviewRow();
+			_chatPreviewTimer.callOnce(kChatPreviewDelay);
+		}
+	} break;
+
+	case QEvent::TouchUpdate: {
+		if (!_chatPreviewTouchGlobal || !point) {
+			return;
+		}
+		const auto delta = (*_chatPreviewTouchGlobal - *point);
+		if (delta.manhattanLength() > _st->photoSize) {
+			cancelChatPreview();
+		}
+	} break;
+
+	case QEvent::TouchEnd:
+	case QEvent::TouchCancel: if (_chatPreviewTouchGlobal) {
+		cancelChatPreview();
+	} break;
+	}
+}
+
 void InnerWidget::applySearchState(SearchState state) {
 	if (_searchState == state) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index b41a4aeb3c5c0..ed94e0b5851de 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -174,6 +174,11 @@ class InnerWidget final : public Ui::RpWidget {
 
 	void parentGeometryChanged();
 
+	void processTouchEvent(not_null<QTouchEvent*> e);
+	[[nodiscard]] rpl::producer<> touchCancelRequests() const {
+		return _touchCancelRequests.events();
+	}
+
 protected:
 	void visibleTopBottomUpdated(
 		int visibleTop,
@@ -520,6 +525,9 @@ class InnerWidget final : public Ui::RpWidget {
 	base::Timer _chatPreviewTimer;
 	Key _chatPreviewWillBeFor;
 	Key _chatPreviewKey;
+	std::optional<QPoint> _chatPreviewTouchLocal;
+	std::optional<QPoint> _chatPreviewTouchGlobal;
+	rpl::event_stream<> _touchCancelRequests;
 
 	rpl::variable<ChildListShown> _childListShown;
 	float64 _narrowRatio = 0.;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index b3b5a31f9089e..092f2f4cc913e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -473,6 +473,7 @@ Widget::Widget(
 	updateSearchFromVisibility(true);
 	setupSupportMode();
 	setupScrollUpButton();
+	setupTouchChatPreview();
 
 	const auto overscrollBg = [=] {
 		return anim::color(
@@ -655,6 +656,18 @@ void Widget::setupScrollUpButton() {
 	updateScrollUpVisibility();
 }
 
+void Widget::setupTouchChatPreview() {
+	_scroll->setCustomTouchProcess([=](not_null<QTouchEvent*> e) {
+		_inner->processTouchEvent(e);
+		return false;
+	});
+	_inner->touchCancelRequests() | rpl::start_with_next([=] {
+		QTouchEvent ev(QEvent::TouchCancel);
+		ev.setTimestamp(crl::now());
+		QGuiApplication::sendEvent(_scroll, &ev);
+	}, _inner->lifetime());
+}
+
 void Widget::setupMoreChatsBar() {
 	if (_layout == Layout::Child) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index ec604f61ca96c..d7e8edaeb8686 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -179,6 +179,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	[[nodiscard]] const std::vector<Data::ReactionId> &searchInTags() const;
 
 	void setupSupportMode();
+	void setupTouchChatPreview();
 	void setupConnectingWidget();
 	void setupMainMenuToggle();
 	void setupMoreChatsBar();
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 495ea0af50da4..33aac93b160d4 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 495ea0af50da469fb30769ac2d78251e4279a746
+Subproject commit 33aac93b160d4cd30119c8859de722e28512902b

From 4953246c5dfd5a4179733db7ff75949866d3bd53 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 23:22:03 +0400
Subject: [PATCH 287/400] Support touchscreen pinned chats reordering.

---
 .../dialogs/dialogs_inner_widget.cpp          | 106 ++++++++++++++----
 .../dialogs/dialogs_inner_widget.h            |   9 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   3 +-
 3 files changed, 90 insertions(+), 28 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 7633e4d2f73e1..dc2728d214f4f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -79,6 +79,8 @@ For license and copyright information please follow this link:
 #include "styles/style_window.h"
 #include "styles/style_menu_icons.h"
 
+#include <QtWidgets/QApplication>
+
 namespace Dialogs {
 namespace {
 
@@ -1316,7 +1318,7 @@ void InnerWidget::paintSearchInTopic(
 }
 
 void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
-	if (_chatPreviewTouchGlobal) {
+	if (_chatPreviewTouchGlobal || _touchDragStartGlobal) {
 		return;
 	}
 	const auto globalPosition = e->globalPos();
@@ -1336,7 +1338,6 @@ void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
 void InnerWidget::cancelChatPreview() {
 	_chatPreviewTimer.cancel();
 	_chatPreviewWillBeFor = {};
-	_chatPreviewTouchLocal = {};
 	_chatPreviewTouchGlobal = {};
 }
 
@@ -1622,8 +1623,14 @@ void InnerWidget::checkReorderPinnedStart(QPoint localPosition) {
 		< style::ConvertScale(kStartReorderThreshold)) {
 		return;
 	}
-	cancelChatPreview();
 	_dragging = _pressed;
+	startReorderPinned(localPosition);
+}
+
+void InnerWidget::startReorderPinned(QPoint localPosition) {
+	Expects(_dragging != nullptr);
+
+	cancelChatPreview();
 	if (updateReorderIndexGetCount() < 2) {
 		_dragging = nullptr;
 	} else {
@@ -1682,6 +1689,7 @@ void InnerWidget::finishReorderPinned() {
 	if (wasDragging) {
 		savePinnedOrder();
 		_dragging = nullptr;
+		_touchDragStartGlobal = {};
 	}
 
 	_draggingIndex = -1;
@@ -1694,6 +1702,22 @@ void InnerWidget::finishReorderPinned() {
 	}
 }
 
+bool InnerWidget::finishReorderOnRelease() {
+	if (!_dragging) {
+		return false;
+	}
+	updateReorderIndexGetCount();
+	if (_draggingIndex >= 0) {
+		_pinnedRows[_draggingIndex].yadd.start(0.);
+		_pinnedRows[_draggingIndex].animStartTime = crl::now();
+		if (!_pinnedShiftAnimation.animating()) {
+			_pinnedShiftAnimation.start();
+		}
+	}
+	finishReorderPinned();
+	return true;
+}
+
 void InnerWidget::stopReorderPinned() {
 	_pinnedShiftAnimation.stop();
 	finishReorderPinned();
@@ -1845,18 +1869,7 @@ void InnerWidget::mousePressReleased(
 	_chatPreviewTimer.cancel();
 	_pressButton = Qt::NoButton;
 
-	auto wasDragging = (_dragging != nullptr);
-	if (wasDragging) {
-		updateReorderIndexGetCount();
-		if (_draggingIndex >= 0) {
-			_pinnedRows[_draggingIndex].yadd.start(0.);
-			_pinnedRows[_draggingIndex].animStartTime = crl::now();
-			if (!_pinnedShiftAnimation.animating()) {
-				_pinnedShiftAnimation.start();
-			}
-		}
-		finishReorderPinned();
-	}
+	const auto wasDragging = finishReorderOnRelease();
 
 	auto collapsedPressed = _collapsedPressed;
 	setCollapsedPressed(-1);
@@ -2547,14 +2560,14 @@ void InnerWidget::parentGeometryChanged() {
 	}
 }
 
-void InnerWidget::processTouchEvent(not_null<QTouchEvent*> e) {
+bool InnerWidget::processTouchEvent(not_null<QTouchEvent*> e) {
 	const auto point = e->touchPoints().empty()
 		? std::optional<QPoint>()
 		: e->touchPoints().front().screenPos().toPoint();
 	switch (e->type()) {
 	case QEvent::TouchBegin: {
 		if (!point) {
-			return;
+			return false;
 		}
 		selectByMouse(*point);
 		const auto onlyUserpic = true;
@@ -2562,24 +2575,69 @@ void InnerWidget::processTouchEvent(not_null<QTouchEvent*> e) {
 			_chatPreviewTouchGlobal = point;
 			_chatPreviewWillBeFor = computeChatPreviewRow();
 			_chatPreviewTimer.callOnce(kChatPreviewDelay);
+		} else if (!_dragging) {
+			_touchDragStartGlobal = point;
+			_touchDragPinnedTimer.callOnce(QApplication::startDragTime());
 		}
 	} break;
 
 	case QEvent::TouchUpdate: {
-		if (!_chatPreviewTouchGlobal || !point) {
-			return;
+		if (!point) {
+			return false;
 		}
-		const auto delta = (*_chatPreviewTouchGlobal - *point);
-		if (delta.manhattanLength() > _st->photoSize) {
-			cancelChatPreview();
+		if (_chatPreviewTouchGlobal) {
+			const auto delta = (*_chatPreviewTouchGlobal - *point);
+			if (delta.manhattanLength() > _st->photoSize) {
+				cancelChatPreview();
+			}
+		}
+		if (_touchDragStartGlobal && _dragging) {
+			updateReorderPinned(mapFromGlobal(*point));
+			return _dragging != nullptr;
+		} else if (_touchDragStartGlobal) {
+			const auto delta = (*_touchDragStartGlobal - *point);
+			if (delta.manhattanLength() > QApplication::startDragDistance()) {
+				if (_touchDragPinnedTimer.isActive()) {
+					_touchDragPinnedTimer.cancel();
+					_touchDragStartGlobal = {};
+					_touchDragNowGlobal = {};
+				} else {
+					dragPinnedFromTouch();
+				}
+			} else {
+				_touchDragNowGlobal = point;
+			}
 		}
 	} break;
 
 	case QEvent::TouchEnd:
-	case QEvent::TouchCancel: if (_chatPreviewTouchGlobal) {
-		cancelChatPreview();
+	case QEvent::TouchCancel: {
+		if (_chatPreviewTouchGlobal) {
+			cancelChatPreview();
+		}
+		if (_touchDragStartGlobal) {
+			_touchDragStartGlobal = {};
+			return finishReorderOnRelease();
+		}
 	} break;
 	}
+	return false;
+}
+
+void InnerWidget::dragPinnedFromTouch() {
+	Expects(_touchDragStartGlobal.has_value());
+
+	const auto global = *_touchDragStartGlobal;
+	_touchDragPinnedTimer.cancel();
+	selectByMouse(global);
+	if (!_selected || _dragging || _state != WidgetState::Default) {
+		return;
+	}
+	_dragStart = mapFromGlobal(global);
+	_dragging = _selected;
+	const auto now = mapFromGlobal(_touchDragNowGlobal.value_or(global));
+	startReorderPinned(now);
+	updateReorderPinned(now);
 }
 
 void InnerWidget::applySearchState(SearchState state) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index ed94e0b5851de..286f84842ca7f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -174,7 +174,7 @@ class InnerWidget final : public Ui::RpWidget {
 
 	void parentGeometryChanged();
 
-	void processTouchEvent(not_null<QTouchEvent*> e);
+	bool processTouchEvent(not_null<QTouchEvent*> e);
 	[[nodiscard]] rpl::producer<> touchCancelRequests() const {
 		return _touchCancelRequests.events();
 	}
@@ -404,15 +404,18 @@ class InnerWidget final : public Ui::RpWidget {
 
 	[[nodiscard]] const std::vector<Key> &pinnedChatsOrder() const;
 	void checkReorderPinnedStart(QPoint localPosition);
+	void startReorderPinned(QPoint localPosition);
 	int updateReorderIndexGetCount();
 	bool updateReorderPinned(QPoint localPosition);
 	void finishReorderPinned();
+	bool finishReorderOnRelease();
 	void stopReorderPinned();
 	int countPinnedIndex(Row *ofRow);
 	void savePinnedOrder();
 	bool pinnedShiftAnimationCallback(crl::time now);
 	void handleChatListEntryRefreshes();
 	void moveCancelSearchButtons();
+	void dragPinnedFromTouch();
 
 	void saveChatsFilterScrollState(FilterId filterId);
 	void restoreChatsFilterScrollState(FilterId filterId);
@@ -525,8 +528,10 @@ class InnerWidget final : public Ui::RpWidget {
 	base::Timer _chatPreviewTimer;
 	Key _chatPreviewWillBeFor;
 	Key _chatPreviewKey;
-	std::optional<QPoint> _chatPreviewTouchLocal;
 	std::optional<QPoint> _chatPreviewTouchGlobal;
+	base::Timer _touchDragPinnedTimer;
+	std::optional<QPoint> _touchDragStartGlobal;
+	std::optional<QPoint> _touchDragNowGlobal;
 	rpl::event_stream<> _touchCancelRequests;
 
 	rpl::variable<ChildListShown> _childListShown;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 092f2f4cc913e..3d73978bf88d3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -658,8 +658,7 @@ void Widget::setupScrollUpButton() {
 
 void Widget::setupTouchChatPreview() {
 	_scroll->setCustomTouchProcess([=](not_null<QTouchEvent*> e) {
-		_inner->processTouchEvent(e);
-		return false;
+		return _inner->processTouchEvent(e);
 	});
 	_inner->touchCancelRequests() | rpl::start_with_next([=] {
 		QTouchEvent ev(QEvent::TouchCancel);

From 27eb3e45bed5916fcb018b9a427fc26b8cfd9787 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 May 2024 23:28:30 +0400
Subject: [PATCH 288/400] Allow only t.me links in factchecks.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../chat_helpers/message_field.cpp            | 57 +++++++++++++++++--
 .../view/history_view_context_menu.cpp        |  2 +-
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 4d17985018d61..1b8491c8503eb 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3305,6 +3305,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_factcheck_edit_done" = "Fact check edited.";
 "lng_factcheck_remove_done" = "Fact check removed.";
 "lng_factcheck_bottom" = "This clarification was provided by a fact checking agency assigned by the department of the government of your country ({country}) responsible for combatting misinformation.";
+"lng_factcheck_links" = "Only **t.me/** links are allowed.";
 
 "lng_translate_show_original" = "Show Original";
 "lng_translate_bar_to" = "Translate to {name}";
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 8b5f3c373f6ea..779bfb4d51d87 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -19,6 +19,7 @@ For license and copyright information please follow this link:
 #include "core/shortcuts.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/widgets/buttons.h"
@@ -115,7 +116,8 @@ void EditLinkBox(
 		const QString &startText,
 		const QString &startLink,
 		Fn<void(QString, QString)> callback,
-		const style::InputField *fieldStyle) {
+		const style::InputField *fieldStyle,
+		Fn<QString(QString)> validate) {
 	Expects(callback != nullptr);
 
 	const auto &fieldSt = fieldStyle ? *fieldStyle : st::defaultInputField;
@@ -160,7 +162,7 @@ void EditLinkBox(
 
 	const auto submit = [=] {
 		const auto linkText = text->getLastText();
-		const auto linkUrl = qthelp::validate_url(url->getLastText());
+		const auto linkUrl = validate(url->getLastText());
 		if (linkText.isEmpty()) {
 			text->showError();
 			return;
@@ -312,7 +314,8 @@ Fn<bool(
 			text,
 			link,
 			std::move(callback),
-			fieldStyle));
+			fieldStyle,
+			qthelp::validate_url));
 		return true;
 	};
 }
@@ -343,6 +346,52 @@ void InitMessageFieldHandlers(
 	}
 }
 
+[[nodiscard]] bool IsGoodFactcheckUrl(QStringView url) {
+	return url.startsWith(u"t.me/"_q) || url.startsWith(u"https://t.me/"_q);
+}
+
+[[nodiscard]] Fn<bool(
+	Ui::InputField::EditLinkSelection selection,
+	QString text,
+	QString link,
+	EditLinkAction action)> FactcheckEditLinkCallback(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<Ui::InputField*> field) {
+	const auto weak = Ui::MakeWeak(field);
+	return [=](
+			EditLinkSelection selection,
+			QString text,
+			QString link,
+			EditLinkAction action) {
+		const auto validate = [=](QString url) {
+			if (IsGoodFactcheckUrl(url)) {
+				const auto start = u"https://"_q;
+				return url.startsWith(start) ? url : (start + url);
+			}
+			show->showToast(
+				tr::lng_factcheck_links(tr::now, Ui::Text::RichLangValue));
+			return QString();
+		};
+		if (action == EditLinkAction::Check) {
+			return IsGoodFactcheckUrl(link);
+		}
+		auto callback = [=](const QString &text, const QString &link) {
+			if (const auto strong = weak.data()) {
+				strong->commitMarkdownLinkEdit(selection, text, link);
+			}
+		};
+		show->showBox(Box(
+			EditLinkBox,
+			show,
+			text,
+			link,
+			std::move(callback),
+			nullptr,
+			validate));
+		return true;
+	};
+}
+
 Fn<void(not_null<Ui::InputField*>)> FactcheckFieldIniter(
 		std::shared_ptr<Main::SessionShow> show) {
 	Expects(show != nullptr);
@@ -374,7 +423,7 @@ Fn<void(not_null<Ui::InputField*>)> FactcheckFieldIniter(
 				}
 			}
 		));
-		field->setEditLinkCallback(DefaultEditLinkCallback(show, field));
+		field->setEditLinkCallback(FactcheckEditLinkCallback(show, field));
 		InitSpellchecker(show, field);
 	};
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index b217777a5a7a1..a53ab20284877 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -734,7 +734,7 @@ void AddFactcheckAction(
 		const auto limit = session->factchecks().lengthLimit();
 		const auto controller = request.navigation->parentController();
 		controller->show(Box(EditFactcheckBox, text, limit, [=](
-			TextWithEntities result) {
+				TextWithEntities result) {
 			const auto show = controller->uiShow();
 			session->factchecks().save(itemId, text, result, show);
 		}, FactcheckFieldIniter(controller->uiShow())));

From 5cfd86b8295d39e6ce153f7bd2b9eff4a05178e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 09:08:30 +0400
Subject: [PATCH 289/400] Use Ui::Text::String to show topic names.

Fixes #27956.
---
 .../SourceFiles/dialogs/ui/dialogs_layout.cpp   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
index f7cbff178fe1d..809a74eaf1aea 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
@@ -259,9 +259,9 @@ void PaintRow(
 		not_null<Entry*> entry,
 		VideoUserpic *videoUserpic,
 		PeerData *from,
-		PeerBadge &fromBadge,
+		PeerBadge &rowBadge,
 		Fn<void()> customEmojiRepaint,
-		const Text::String &fromName,
+		const Text::String &rowName,
 		const HiddenSenderInfo *hiddenSenderInfo,
 		HistoryItem *item,
 		const Data::Draft *draft,
@@ -626,10 +626,10 @@ void PaintRow(
 		p.drawTextLeft(rectForName.left(), rectForName.top(), context.width, text);
 	} else if (from) {
 		if ((history || sublist) && !context.search) {
-			const auto badgeWidth = fromBadge.drawGetWidth(
+			const auto badgeWidth = rowBadge.drawGetWidth(
 				p,
 				rectForName,
-				fromName.maxWidth(),
+				rowName.maxWidth(),
 				context.width,
 				{
 					.peer = from,
@@ -663,7 +663,7 @@ void PaintRow(
 			: context.selected
 			? st::dialogsNameFgOver
 			: st::dialogsNameFg);
-		fromName.drawElided(p, rectForName.left(), rectForName.top(), rectForName.width());
+		rowName.drawElided(p, rectForName.left(), rectForName.top(), rectForName.width());
 	} else if (hiddenSenderInfo) {
 		p.setPen(context.active
 			? st::dialogsNameFgActive
@@ -681,12 +681,7 @@ void PaintRow(
 			: (context.selected
 				? st::dialogsNameFgOver
 				: st::dialogsNameFg));
-		auto text = entry->chatListName(); // TODO feed name with emoji
-		auto textWidth = st::semiboldFont->width(text);
-		if (textWidth > rectForName.width()) {
-			text = st::semiboldFont->elided(text, rectForName.width());
-		}
-		p.drawTextLeft(rectForName.left(), rectForName.top(), context.width, text);
+		rowName.drawElided(p, rectForName.left(), rectForName.top(), rectForName.width());
 	}
 }
 

From ad342a5324e31c5cbd7e7252af4aab9e0c8d82ad Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 13:15:51 +0400
Subject: [PATCH 290/400] Extract chat preview as a SessionController part.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../dialogs/dialogs_inner_widget.cpp          | 155 +++++++-----------
 .../dialogs/dialogs_inner_widget.h            |  12 +-
 .../window/window_chat_preview.cpp            | 126 ++++++++++++++
 .../SourceFiles/window/window_chat_preview.h  |  48 ++++++
 .../window/window_session_controller.cpp      |  20 +++
 .../window/window_session_controller.h        |  10 ++
 7 files changed, 267 insertions(+), 106 deletions(-)
 create mode 100644 Telegram/SourceFiles/window/window_chat_preview.cpp
 create mode 100644 Telegram/SourceFiles/window/window_chat_preview.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index fa06b446a675b..8b081b263729b 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1516,6 +1516,8 @@ PRIVATE
     window/section_widget.h
     window/window_adaptive.cpp
     window/window_adaptive.h
+    window/window_chat_preview.cpp
+    window/window_chat_preview.h
     window/window_connecting_widget.cpp
     window/window_connecting_widget.h
     window/window_controller.cpp
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index dc2728d214f4f..112e4c9dfa0e7 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -86,7 +86,6 @@ namespace {
 
 constexpr auto kHashtagResultsLimit = 5;
 constexpr auto kStartReorderThreshold = 30;
-constexpr auto kChatPreviewDelay = crl::time(1000);
 
 [[nodiscard]] int FixedOnTopDialogsCount(not_null<Dialogs::IndexedList*> list) {
 	auto result = 0;
@@ -216,7 +215,6 @@ InnerWidget::InnerWidget(
 	+ st::defaultDialogRow.photoSize
 	+ st::defaultDialogRow.padding.left())
 , _cancelSearchFromUser(this, st::dialogsCancelSearchInPeer)
-, _chatPreviewTimer([=] { showChatPreview(true); })
 , _childListShown(std::move(childListShown)) {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 
@@ -714,8 +712,8 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		context.active = active;
 		context.selected = _menuRow.key
 			? (row->key() == _menuRow.key)
-			: _chatPreviewKey
-			? (row->key() == _chatPreviewKey)
+			: _chatPreviewRow.key
+			? (row->key() == _chatPreviewRow.key)
 			: selected;
 		context.topicJumpSelected = selected
 			&& _selectedTopicJump
@@ -981,6 +979,8 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 					const auto active = isSearchResultActive(result.get(), activeEntry);
 					const auto selected = _menuRow.key
 						? isSearchResultActive(result.get(), _menuRow)
+						: _chatPreviewRow.key
+						? isSearchResultActive(result.get(), _chatPreviewRow)
 						: (from == (isPressed()
 							? _searchedPressed
 							: _searchedSelected));
@@ -1330,15 +1330,18 @@ void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
 		return;
 	}
 	selectByMouse(globalPosition);
-	if (!isUserpicPress()) {
+	if (_chatPreviewScheduled && !isUserpicPress()) {
 		cancelChatPreview();
 	}
 }
 
 void InnerWidget::cancelChatPreview() {
-	_chatPreviewTimer.cancel();
-	_chatPreviewWillBeFor = {};
 	_chatPreviewTouchGlobal = {};
+	_chatPreviewScheduled = false;
+	if (_chatPreviewRow.key) {
+		updateDialogRow(base::take(_chatPreviewRow));
+	}
+	_controller->cancelScheduledPreview();
 }
 
 void InnerWidget::clearIrrelevantState() {
@@ -1484,26 +1487,24 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 	}
 }
 
-Key InnerWidget::computeChatPreviewRow() const {
-	auto result = computeChosenRow().key;
-	if (const auto peer = result.peer()) {
+RowDescriptor InnerWidget::computeChatPreviewRow() const {
+	auto result = computeChosenRow();
+	if (const auto peer = result.key.peer()) {
 		const auto topicId = _pressedTopicJump
 			? _pressedTopicJumpRootId
 			: 0;
 		if (const auto topic = peer->forumTopicFor(topicId)) {
-			return topic;
+			return { topic, FullMsgId() };
 		}
 	}
-	return result;
+	return { result.key, result.message.fullId };
 }
 
 void InnerWidget::processGlobalForceClick(QPoint globalPosition) {
 	const auto parent = parentWidget();
 	if (_pressButton == Qt::LeftButton
-		&& parent->rect().contains(parent->mapFromGlobal(globalPosition))
-		&& pressShowsPreview(false)) {
-		_chatPreviewWillBeFor = computeChatPreviewRow();
-		showChatPreview(false);
+		&& parent->rect().contains(parent->mapFromGlobal(globalPosition))) {
+		showChatPreview();
 	}
 }
 
@@ -1520,14 +1521,10 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	setSearchedPressed(_searchedSelected);
 
 	const auto alt = (e->modifiers() & Qt::AltModifier);
-	const auto onlyUserpic = !alt;
-	if (pressShowsPreview(onlyUserpic)) {
-		_chatPreviewWillBeFor = computeChatPreviewRow();
-		if (alt) {
-			showChatPreview(onlyUserpic);
-			return;
-		}
-		_chatPreviewTimer.callOnce(kChatPreviewDelay);
+	if (alt && showChatPreview()) {
+		return;
+	} else if (!alt && isUserpicPress()) {
+		scheduleChatPreview();
 	}
 
 	if (base::in_range(_collapsedSelected, 0, _collapsedRows.size())) {
@@ -1599,7 +1596,7 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	}
 	ClickHandler::pressed();
 	if (anim::Disabled()
-		&& !_chatPreviewTimer.isActive()
+		&& !_chatPreviewScheduled
 		&& (!_pressed || !_pressed->entry()->isPinnedDialog(_filterId))) {
 		mousePressReleased(e->globalPos(), e->button(), e->modifiers());
 	}
@@ -1866,7 +1863,9 @@ void InnerWidget::mousePressReleased(
 		QPoint globalPosition,
 		Qt::MouseButton button,
 		Qt::KeyboardModifiers modifiers) {
-	_chatPreviewTimer.cancel();
+	if (_chatPreviewScheduled) {
+		_controller->cancelScheduledPreview();
+	}
 	_pressButton = Qt::NoButton;
 
 	const auto wasDragging = finishReorderOnRelease();
@@ -2412,67 +2411,40 @@ void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 	});
 }
 
-void InnerWidget::showChatPreview(bool onlyUserpic) {
-	const auto key = base::take(_chatPreviewWillBeFor);
-	const auto touchGlobal = base::take(_chatPreviewTouchGlobal);
-	cancelChatPreview();
-	if (!pressShowsPreview(onlyUserpic) || key != computeChatPreviewRow()) {
-		return;
-	}
-	if (onlyUserpic && touchGlobal) {
-		_touchCancelRequests.fire({});
-	}
-	ClickHandler::unpressed();
-	mousePressReleased(QCursor::pos(), Qt::NoButton, Qt::NoModifier);
+bool InnerWidget::showChatPreview() {
+	const auto row = computeChatPreviewRow();
+	const auto callback = crl::guard(this, [=](bool shown) {
+		chatPreviewShown(shown, row);
+	});
+	return _controller->showChatPreview(row, callback);
+}
 
-	_chatPreviewKey = key;
-	auto preview = HistoryView::MakeChatPreview(this, key.entry());
-	if (!preview.menu) {
-		return;
-	}
-	_menu = std::move(preview.menu);
-	const auto weakMenu = Ui::MakeWeak(_menu.get());
-	const auto weakThread = base::make_weak(key.entry()->asThread());
-	const auto weakController = base::make_weak(_controller);
-	std::move(
-		preview.actions
-	) | rpl::start_with_next([=](HistoryView::ChatPreviewAction action) {
-		if (const auto controller = weakController.get()) {
-			if (const auto thread = weakThread.get()) {
-				const auto itemId = action.openItemId;
-				const auto owner = &thread->owner();
-				if (action.markRead) {
-					Window::MarkAsReadThread(thread);
-				} else if (action.markUnread) {
-					if (const auto history = thread->asHistory()) {
-						history->owner().histories().changeDialogUnreadMark(
-							history,
-							true);
-					}
-				} else if (action.openInfo) {
-					controller->showPeerInfo(thread);
-				} else if (const auto item = owner->message(itemId)) {
-					controller->showMessage(item);
-				} else {
-					controller->showThread(thread);
-				}
-			}
-		}
-		if (const auto strong = weakMenu.data()) {
-			strong->hideMenu();
-		}
-	}, _menu->lifetime());
-	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
-		if (_chatPreviewKey) {
-			updateDialogRow(RowDescriptor(base::take(_chatPreviewKey), {}));
+void InnerWidget::chatPreviewShown(bool shown, RowDescriptor row) {
+	_chatPreviewScheduled = false;
+	if (shown) {
+		_chatPreviewRow = row;
+		if (base::take(_chatPreviewTouchGlobal)) {
+			_touchCancelRequests.fire({});
 		}
+		ClickHandler::unpressed();
+		mousePressReleased(QCursor::pos(), Qt::NoButton, Qt::NoModifier);
+	} else {
+		cancelChatPreview();
 		const auto globalPosition = QCursor::pos();
 		if (rect().contains(mapFromGlobal(globalPosition))) {
 			setMouseTracking(true);
 			selectByMouse(globalPosition);
 		}
+	}
+}
+
+bool InnerWidget::scheduleChatPreview() {
+	const auto row = computeChatPreviewRow();
+	const auto callback = crl::guard(this, [=](bool shown) {
+		chatPreviewShown(shown, row);
 	});
-	_menu->popup(_lastMousePosition.value_or(QCursor::pos()));
+	_chatPreviewScheduled = _controller->scheduleChatPreview(row, callback);
+	return _chatPreviewScheduled;
 }
 
 void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
@@ -2571,10 +2543,8 @@ bool InnerWidget::processTouchEvent(not_null<QTouchEvent*> e) {
 		}
 		selectByMouse(*point);
 		const auto onlyUserpic = true;
-		if (pressShowsPreview(onlyUserpic)) {
+		if (isUserpicPress() && scheduleChatPreview()) {
 			_chatPreviewTouchGlobal = point;
-			_chatPreviewWillBeFor = computeChatPreviewRow();
-			_chatPreviewTimer.callOnce(kChatPreviewDelay);
 		} else if (!_dragging) {
 			_touchDragStartGlobal = point;
 			_touchDragPinnedTimer.callOnce(QApplication::startDragTime());
@@ -2894,11 +2864,8 @@ void InnerWidget::trackSearchResultsHistory(not_null<History*> history) {
 				refresh();
 				clearMouseSelection(true);
 			}
-			if (_chatPreviewWillBeFor.topic() == topic) {
-				_chatPreviewWillBeFor = {};
-			}
-			if (_chatPreviewKey.topic() == topic) {
-				_chatPreviewKey = {};
+			if (_chatPreviewRow.key.topic() == topic) {
+				_chatPreviewRow = {};
 			}
 		}, _searchResultsLifetime);
 	}
@@ -3793,18 +3760,6 @@ bool InnerWidget::isUserpicPressOnWide() const {
 	return isUserpicPress() && (width() > _narrowWidth);
 }
 
-bool InnerWidget::pressShowsPreview(bool onlyUserpic) const {
-	if (onlyUserpic && !isUserpicPress()) {
-		return false;
-	}
-	const auto key = computeChosenRow().key;
-	if (const auto history = key.history()) {
-		return !history->peer->isForum()
-			|| (_pressedTopicJump && _pressedTopicJumpRootId);
-	}
-	return key.topic() != nullptr;
-}
-
 bool InnerWidget::chooseRow(
 		Qt::KeyboardModifiers modifiers,
 		MsgId pressedTopicRootId) {
@@ -4157,7 +4112,7 @@ void InnerWidget::setupShortcuts() {
 			&& !_controller->isLayerShown()
 			&& !_controller->window().locked()
 			&& !_childListShown.current().shown
-			&& !_chatPreviewKey;
+			&& !_chatPreviewRow.key;
 	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 286f84842ca7f..ccca8eb71883c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -125,9 +125,10 @@ class InnerWidget final : public Ui::RpWidget {
 
 	[[nodiscard]] bool isUserpicPress() const;
 	[[nodiscard]] bool isUserpicPressOnWide() const;
-	[[nodiscard]] bool pressShowsPreview(bool onlyUserpic) const;
 	void cancelChatPreview();
-	void showChatPreview(bool onlyUserpic);
+	bool scheduleChatPreview();
+	bool showChatPreview();
+	void chatPreviewShown(bool shown, RowDescriptor row = {});
 	bool chooseRow(
 		Qt::KeyboardModifiers modifiers = {},
 		MsgId pressedTopicRootId = {});
@@ -400,7 +401,7 @@ class InnerWidget final : public Ui::RpWidget {
 	void trackSearchResultsHistory(not_null<History*> history);
 
 	[[nodiscard]] QBrush currentBg() const;
-	[[nodiscard]] Key computeChatPreviewRow() const;
+	[[nodiscard]] RowDescriptor computeChatPreviewRow() const;
 
 	[[nodiscard]] const std::vector<Key> &pinnedChatsOrder() const;
 	void checkReorderPinnedStart(QPoint localPosition);
@@ -525,9 +526,8 @@ class InnerWidget final : public Ui::RpWidget {
 	rpl::event_stream<QString> _completeHashtagRequests;
 	rpl::event_stream<> _refreshHashtagsRequests;
 
-	base::Timer _chatPreviewTimer;
-	Key _chatPreviewWillBeFor;
-	Key _chatPreviewKey;
+	RowDescriptor _chatPreviewRow;
+	bool _chatPreviewScheduled = false;
 	std::optional<QPoint> _chatPreviewTouchGlobal;
 	base::Timer _touchDragPinnedTimer;
 	std::optional<QPoint> _touchDragStartGlobal;
diff --git a/Telegram/SourceFiles/window/window_chat_preview.cpp b/Telegram/SourceFiles/window/window_chat_preview.cpp
new file mode 100644
index 0000000000000..cee4671ddb5b4
--- /dev/null
+++ b/Telegram/SourceFiles/window/window_chat_preview.cpp
@@ -0,0 +1,126 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "window/window_chat_preview.h"
+
+#include "data/data_forum_topic.h"
+#include "data/data_histories.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/view/history_view_chat_preview.h"
+#include "mainwidget.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/window_peer_menu.h"
+#include "window/window_session_controller.h"
+
+namespace Window {
+namespace {
+
+constexpr auto kChatPreviewDelay = crl::time(1000);
+
+} // namespace
+
+ChatPreviewManager::ChatPreviewManager(
+	not_null<SessionController*> controller)
+: _controller(controller)
+, _timer([=] { showScheduled(); }) {
+}
+
+bool ChatPreviewManager::show(
+		Dialogs::RowDescriptor row,
+		Fn<void(bool shown)> callback) {
+	cancelScheduled();
+	_topicLifetime.destroy();
+	if (const auto topic = row.key.topic()) {
+		_topicLifetime = topic->destroyed() | rpl::start_with_next([=] {
+			_menu = nullptr;
+		});
+	}
+
+	const auto parent = _controller->content();
+	auto preview = HistoryView::MakeChatPreview(parent, row.key.entry());
+	if (!preview.menu) {
+		return false;
+	}
+	_menu = std::move(preview.menu);
+	const auto weakMenu = Ui::MakeWeak(_menu.get());
+	const auto weakThread = base::make_weak(row.key.entry()->asThread());
+	const auto weakController = base::make_weak(_controller);
+	std::move(
+		preview.actions
+	) | rpl::start_with_next([=](HistoryView::ChatPreviewAction action) {
+		if (const auto controller = weakController.get()) {
+			if (const auto thread = weakThread.get()) {
+				const auto itemId = action.openItemId;
+				const auto owner = &thread->owner();
+				if (action.markRead) {
+					MarkAsReadThread(thread);
+				} else if (action.markUnread) {
+					if (const auto history = thread->asHistory()) {
+						history->owner().histories().changeDialogUnreadMark(
+							history,
+							true);
+					}
+				} else if (action.openInfo) {
+					controller->showPeerInfo(thread);
+				} else if (const auto item = owner->message(itemId)) {
+					controller->showMessage(item);
+				} else {
+					controller->showThread(thread);
+				}
+			}
+		}
+		if (const auto strong = weakMenu.data()) {
+			strong->hideMenu();
+		}
+	}, _menu->lifetime());
+	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
+		_topicLifetime.destroy();
+		callback(false);
+	});
+
+	callback(true);
+	_menu->popup(QCursor::pos());
+
+	return true;
+}
+
+bool ChatPreviewManager::schedule(
+		Dialogs::RowDescriptor row,
+		Fn<void(bool shown)> callback) {
+	cancelScheduled();
+	_topicLifetime.destroy();
+	if (const auto topic = row.key.topic()) {
+		_topicLifetime = topic->destroyed() | rpl::start_with_next([=] {
+			cancelScheduled();
+			_menu = nullptr;
+		});
+	} else if (const auto history = row.key.history()) {
+		if (history->peer->isForum()) {
+			return false;
+		}
+	} else {
+		return false;
+	}
+	_scheduled = row;
+	_scheduledCallback = std::move(callback);
+	_timer.callOnce(kChatPreviewDelay);
+	return true;
+}
+
+void ChatPreviewManager::showScheduled() {
+	show(base::take(_scheduled), base::take(_scheduledCallback));
+}
+
+void ChatPreviewManager::cancelScheduled() {
+	_scheduled = {};
+	_scheduledCallback = nullptr;
+	_timer.cancel();
+}
+
+} // namespace Window
\ No newline at end of file
diff --git a/Telegram/SourceFiles/window/window_chat_preview.h b/Telegram/SourceFiles/window/window_chat_preview.h
new file mode 100644
index 0000000000000..c3744e6979bf8
--- /dev/null
+++ b/Telegram/SourceFiles/window/window_chat_preview.h
@@ -0,0 +1,48 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "base/unique_qptr.h"
+#include "dialogs/dialogs_key.h"
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace Window {
+
+class SessionController;
+
+class ChatPreviewManager final {
+public:
+	ChatPreviewManager(not_null<SessionController*> controller);
+
+	bool show(
+		Dialogs::RowDescriptor row,
+		Fn<void(bool shown)> callback = nullptr);
+	bool schedule(
+		Dialogs::RowDescriptor row,
+		Fn<void(bool shown)> callback = nullptr);
+	void cancelScheduled();
+
+private:
+	void showScheduled();
+
+	const not_null<SessionController*> _controller;
+	Dialogs::RowDescriptor _scheduled;
+	Fn<void(bool)> _scheduledCallback;
+	base::Timer _timer;
+
+	rpl::lifetime _topicLifetime;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+};
+
+} // namespace Window
\ No newline at end of file
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 37acebe474788..e673da20a0618 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "boxes/peers/edit_peer_info_box.h"
 #include "boxes/peers/replace_boost_box.h"
 #include "boxes/delete_messages_box.h"
+#include "window/window_chat_preview.h"
 #include "window/window_controller.h"
 #include "window/window_filters_menu.h"
 #include "info/channel_statistics/earn/info_earn_inner_widget.h"
@@ -1179,6 +1180,7 @@ SessionController::SessionController(
 , _window(window)
 , _emojiInteractions(
 	std::make_unique<ChatHelpers::EmojiInteractions>(session))
+, _chatPreviewManager(std::make_unique<ChatPreviewManager>(this))
 , _isPrimary(window->isPrimary())
 , _sendingAnimation(
 	std::make_unique<Ui::MessageSendingAnimationController>(this))
@@ -2974,6 +2976,24 @@ QString SessionController::premiumRef() const {
 	return _premiumRef;
 }
 
+bool SessionController::showChatPreview(
+		Dialogs::RowDescriptor row,
+		Fn<void(bool shown)> callback) {
+	return _chatPreviewManager->show(std::move(row), std::move(callback));
+}
+
+bool SessionController::scheduleChatPreview(
+		Dialogs::RowDescriptor row,
+		Fn<void(bool shown)> callback) {
+	return _chatPreviewManager->schedule(
+		std::move(row),
+		std::move(callback));
+}
+
+void SessionController::cancelScheduledPreview() {
+	_chatPreviewManager->cancelScheduled();
+}
+
 bool SessionController::contentOverlapped(QWidget *w, QPaintEvent *e) const {
 	return widget()->contentOverlapped(w, e);
 }
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 38085b945641d..0cbaf0b9a7a58 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -88,6 +88,7 @@ using GifPauseReasons = ChatHelpers::PauseReasons;
 class SectionMemento;
 class Controller;
 class FiltersMenu;
+class ChatPreviewManager;
 
 struct PeerByLinkInfo;
 
@@ -600,6 +601,14 @@ class SessionController : public SessionNavigation {
 	void setPremiumRef(const QString &ref);
 	[[nodiscard]] QString premiumRef() const;
 
+	bool showChatPreview(
+		Dialogs::RowDescriptor row,
+		Fn<void(bool shown)> callback = nullptr);
+	bool scheduleChatPreview(
+		Dialogs::RowDescriptor row,
+		Fn<void(bool shown)> callback = nullptr);
+	void cancelScheduledPreview();
+
 	[[nodiscard]] bool contentOverlapped(QWidget *w, QPaintEvent *e) const;
 
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() override;
@@ -656,6 +665,7 @@ class SessionController : public SessionNavigation {
 
 	const not_null<Controller*> _window;
 	const std::unique_ptr<ChatHelpers::EmojiInteractions> _emojiInteractions;
+	const std::unique_ptr<ChatPreviewManager> _chatPreviewManager;
 	const bool _isPrimary = false;
 
 	mutable std::shared_ptr<ChatHelpers::Show> _cachedShow;

From 4e8895ddd93d74d32728f9276270d8fc0352c2f0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 14:39:35 +0400
Subject: [PATCH 291/400] Show "View as Messages" preview by Alt+Click.

---
 .../dialogs/dialogs_inner_widget.cpp          |  2 ++
 .../view/history_view_chat_preview.cpp        | 16 ++++++----
 .../history/view/history_view_message.cpp     |  4 ++-
 .../window/window_chat_preview.cpp            | 27 ++++++++++------
 .../SourceFiles/window/window_chat_preview.h  |  7 +++--
 .../SourceFiles/window/window_peer_menu.cpp   | 31 +++++++++++++++++--
 .../window/window_session_controller.cpp      | 14 ++++++---
 .../window/window_session_controller.h        |  6 ++--
 Telegram/lib_ui                               |  2 +-
 9 files changed, 80 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 112e4c9dfa0e7..343730d18b93d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1495,6 +1495,8 @@ RowDescriptor InnerWidget::computeChatPreviewRow() const {
 			: 0;
 		if (const auto topic = peer->forumTopicFor(topicId)) {
 			return { topic, FullMsgId() };
+		} else if (peer->isForum() && !result.key.topic()) {
+			return {};
 		}
 	}
 	return { result.key, result.message.fullId };
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index fdc7607f93072..91540a7291ba4 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -22,6 +22,7 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_list_widget.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "info/profile/info_profile_cover.h"
 #include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
@@ -369,7 +370,10 @@ void Item::setupMarkRead() {
 	) | rpl::start_with_next([=] {
 		const auto state = _thread->chatListBadgesState();
 		const auto unread = (state.unreadCounter || state.unread);
-		if (_thread->asTopic() && !unread) {
+		const auto hidden = _thread->asTopic()
+			? (!unread)
+			: _thread->peer()->isForum();
+		if (hidden) {
 			_markRead->hide();
 			return;
 		}
@@ -595,7 +599,11 @@ void Item::listUpdateDateLink(
 }
 
 bool Item::listElementHideReply(not_null<const Element*> view) {
-	return false;
+	if (!view->isTopicRootReply()) {
+		return false;
+	}
+	const auto reply = view->data()->Get<HistoryMessageReply>();
+	return reply && !reply->fields().manualQuote;
 }
 
 bool Item::listElementShownUnread(not_null<const Element*> view) {
@@ -769,10 +777,6 @@ ChatPreview MakeChatPreview(
 	const auto thread = entry->asThread();
 	if (!thread) {
 		return {};
-	} else if (const auto history = entry->asHistory()) {
-		if (history->peer->isForum()) {
-			return {};
-		}
 	}
 
 	auto result = ChatPreview{
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 133a19973aa1d..38b89f061fb57 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1042,7 +1042,9 @@ QSize Message::performCountOptimalSize() {
 
 void Message::refreshTopicButton() {
 	const auto item = data();
-	if (isAttachedToPrevious() || context() != Context::History) {
+	if (isAttachedToPrevious()
+		|| (context() != Context::History
+			&& context() != Context::ChatPreview)) {
 		_topicButton = nullptr;
 	} else if (const auto topic = item->topic()) {
 		if (!_topicButton) {
diff --git a/Telegram/SourceFiles/window/window_chat_preview.cpp b/Telegram/SourceFiles/window/window_chat_preview.cpp
index cee4671ddb5b4..24a71c3bcfd8e 100644
--- a/Telegram/SourceFiles/window/window_chat_preview.cpp
+++ b/Telegram/SourceFiles/window/window_chat_preview.cpp
@@ -33,16 +33,21 @@ ChatPreviewManager::ChatPreviewManager(
 
 bool ChatPreviewManager::show(
 		Dialogs::RowDescriptor row,
-		Fn<void(bool shown)> callback) {
+		Fn<void(bool shown)> callback,
+		QPointer<QWidget> parentOverride) {
 	cancelScheduled();
 	_topicLifetime.destroy();
 	if (const auto topic = row.key.topic()) {
 		_topicLifetime = topic->destroyed() | rpl::start_with_next([=] {
 			_menu = nullptr;
 		});
+	} else if (!row.key) {
+		return false;
 	}
 
-	const auto parent = _controller->content();
+	const auto parent = parentOverride
+		? parentOverride
+		: _controller->content();
 	auto preview = HistoryView::MakeChatPreview(parent, row.key.entry());
 	if (!preview.menu) {
 		return false;
@@ -81,10 +86,14 @@ bool ChatPreviewManager::show(
 	}, _menu->lifetime());
 	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
 		_topicLifetime.destroy();
-		callback(false);
+		if (callback) {
+			callback(false);
+		}
 	});
 
-	callback(true);
+	if (callback) {
+		callback(true);
+	}
 	_menu->popup(QCursor::pos());
 
 	return true;
@@ -92,7 +101,8 @@ bool ChatPreviewManager::show(
 
 bool ChatPreviewManager::schedule(
 		Dialogs::RowDescriptor row,
-		Fn<void(bool shown)> callback) {
+		Fn<void(bool shown)> callback,
+		QPointer<QWidget> parentOverride) {
 	cancelScheduled();
 	_topicLifetime.destroy();
 	if (const auto topic = row.key.topic()) {
@@ -100,15 +110,12 @@ bool ChatPreviewManager::schedule(
 			cancelScheduled();
 			_menu = nullptr;
 		});
-	} else if (const auto history = row.key.history()) {
-		if (history->peer->isForum()) {
-			return false;
-		}
 	} else {
 		return false;
 	}
-	_scheduled = row;
+	_scheduled = std::move(row);
 	_scheduledCallback = std::move(callback);
+	_scheduledParentOverride = std::move(parentOverride);
 	_timer.callOnce(kChatPreviewDelay);
 	return true;
 }
diff --git a/Telegram/SourceFiles/window/window_chat_preview.h b/Telegram/SourceFiles/window/window_chat_preview.h
index c3744e6979bf8..6101ac3e99998 100644
--- a/Telegram/SourceFiles/window/window_chat_preview.h
+++ b/Telegram/SourceFiles/window/window_chat_preview.h
@@ -25,10 +25,12 @@ class ChatPreviewManager final {
 
 	bool show(
 		Dialogs::RowDescriptor row,
-		Fn<void(bool shown)> callback = nullptr);
+		Fn<void(bool shown)> callback = nullptr,
+		QPointer<QWidget> parentOverride = nullptr);
 	bool schedule(
 		Dialogs::RowDescriptor row,
-		Fn<void(bool shown)> callback = nullptr);
+		Fn<void(bool shown)> callback = nullptr,
+		QPointer<QWidget> parentOverride = nullptr);
 	void cancelScheduled();
 
 private:
@@ -37,6 +39,7 @@ class ChatPreviewManager final {
 	const not_null<SessionController*> _controller;
 	Dialogs::RowDescriptor _scheduled;
 	Fn<void(bool)> _scheduledCallback;
+	QPointer<QWidget> _scheduledParentOverride;
 	base::Timer _timer;
 
 	rpl::lifetime _topicLifetime;
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index cea2896683a7d..b1a37190f2e56 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -20,6 +20,7 @@ For license and copyright information please follow this link:
 #include "base/random.h"
 #include "base/options.h"
 #include "base/unixtime.h"
+#include "base/qt/qt_key_modifiers.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/max_invite_box.h"
 #include "boxes/moderate_messages_box.h"
@@ -94,7 +95,7 @@ For license and copyright information please follow this link:
 #include "styles/style_menu_icons.h"
 
 #include <QAction>
-#include <QtGui/QGuiApplication>
+#include <QtWidgets/QApplication>
 
 namespace Window {
 namespace {
@@ -1239,12 +1240,36 @@ void Filler::addViewAsMessages() {
 	}
 	const auto peer = _peer;
 	const auto controller = _controller;
-	_addAction(tr::lng_forum_view_as_messages(tr::now), [=] {
+	const auto parentHideRequests = std::make_shared<rpl::event_stream<>>();
+	const auto filterOutChatPreview = [=] {
+		if (base::IsAltPressed()) {
+			const auto callback = [=](bool shown) {
+				if (!shown) {
+					parentHideRequests->fire({});
+				}
+			};
+			controller->showChatPreview({
+				peer->owner().history(peer),
+				FullMsgId(),
+			}, callback, QApplication::activePopupWidget());
+			return true;
+		}
+		return false;
+	};
+	const auto open = [=] {
 		if (const auto forum = peer->forum()) {
 			peer->owner().saveViewAsMessages(forum, true);
 		}
 		controller->showPeerHistory(peer->id);
-	}, &st::menuIconAsMessages);
+	};
+	auto to_instant = rpl::map_to(anim::type::instant);
+	_addAction({
+		.text = tr::lng_forum_view_as_messages(tr::now),
+		.handler = open,
+		.icon = &st::menuIconAsMessages,
+		.triggerFilter = filterOutChatPreview,
+		.hideRequests = parentHideRequests->events() | to_instant
+	});
 }
 
 void Filler::addViewAsTopics() {
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index e673da20a0618..4a004dce81422 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2978,16 +2978,22 @@ QString SessionController::premiumRef() const {
 
 bool SessionController::showChatPreview(
 		Dialogs::RowDescriptor row,
-		Fn<void(bool shown)> callback) {
-	return _chatPreviewManager->show(std::move(row), std::move(callback));
+		Fn<void(bool shown)> callback,
+		QPointer<QWidget> parentOverride) {
+	return _chatPreviewManager->show(
+		std::move(row),
+		std::move(callback),
+		std::move(parentOverride));
 }
 
 bool SessionController::scheduleChatPreview(
 		Dialogs::RowDescriptor row,
-		Fn<void(bool shown)> callback) {
+		Fn<void(bool shown)> callback,
+		QPointer<QWidget> parentOverride) {
 	return _chatPreviewManager->schedule(
 		std::move(row),
-		std::move(callback));
+		std::move(callback),
+		std::move(parentOverride));
 }
 
 void SessionController::cancelScheduledPreview() {
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 0cbaf0b9a7a58..37f45f86e79b7 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -603,10 +603,12 @@ class SessionController : public SessionNavigation {
 
 	bool showChatPreview(
 		Dialogs::RowDescriptor row,
-		Fn<void(bool shown)> callback = nullptr);
+		Fn<void(bool shown)> callback = nullptr,
+		QPointer<QWidget> parentOverride = nullptr);
 	bool scheduleChatPreview(
 		Dialogs::RowDescriptor row,
-		Fn<void(bool shown)> callback = nullptr);
+		Fn<void(bool shown)> callback = nullptr,
+		QPointer<QWidget> parentOverride = nullptr);
 	void cancelScheduledPreview();
 
 	[[nodiscard]] bool contentOverlapped(QWidget *w, QPaintEvent *e) const;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 33aac93b160d4..d0514b2b02204 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 33aac93b160d4cd30119c8859de722e28512902b
+Subproject commit d0514b2b022043b3777b06d6068232aa4cda7e80

From f9f51b4e419be73b672f598ec8639fd86c6c15aa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 15:01:43 +0400
Subject: [PATCH 292/400] Show preview in Frequent Contacts.

---
 .../dialogs/ui/dialogs_suggestions.cpp        | 29 +++++++++++++++++++
 .../dialogs/ui/dialogs_suggestions.h          |  2 ++
 .../dialogs/ui/top_peers_strip.cpp            | 28 ++++++++++++++++++
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |  5 ++++
 .../window/window_chat_preview.cpp            |  2 +-
 5 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 9a86cca750fc8..28802c811e28f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "api/api_chat_participants.h"
 #include "apiwrap.h"
 #include "base/unixtime.h"
+#include "base/qt/qt_key_modifiers.h"
 #include "boxes/peer_list_box.h"
 #include "data/components/recent_peers.h"
 #include "data/components/top_peers.h"
@@ -940,6 +941,16 @@ void Suggestions::setupChats() {
 		_topPeerChosen.fire(_controller->session().data().peer(peerId));
 	}, _topPeers->lifetime());
 
+	_topPeers->pressed() | rpl::start_with_next([=](uint64 peerIdRaw) {
+		handlePressForChatPreview(PeerId(peerIdRaw), [=] {
+			_topPeers->cancelPress();
+		});
+	}, _topPeers->lifetime());
+
+	_topPeers->pressCancelled() | rpl::start_with_next([=] {
+		_controller->cancelScheduledPreview();
+	}, _topPeers->lifetime());
+
 	_topPeers->showMenuRequests(
 	) | rpl::start_with_next([=](const ShowTopPeerMenuRequest &request) {
 		const auto weak = Ui::MakeWeak(this);
@@ -983,6 +994,24 @@ void Suggestions::setupChats() {
 	_chatsScroll->setVisible(_tab.current() == Tab::Chats);
 }
 
+void Suggestions::handlePressForChatPreview(
+		PeerId id,
+		Fn<void()> cancelPress) {
+	const auto callback = crl::guard(this, [=](bool shown) {
+		if (shown) {
+			cancelPress();
+		}
+	});
+	const auto row = RowDescriptor(
+		_controller->session().data().history(id),
+		FullMsgId());
+	if (base::IsAltPressed()) {
+		_controller->showChatPreview(row, callback);
+	} else {
+		_controller->scheduleChatPreview(row, callback);
+	}
+}
+
 void Suggestions::setupChannels() {
 	_myChannelsCount.value() | rpl::start_with_next([=](int count) {
 		_myChannels->toggle(count > 0, anim::type::instant);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index 27b9b527fdc8a..16e07d15b5f71 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -122,6 +122,8 @@ class Suggestions final : public Ui::RpWidget {
 	void startSlideAnimation();
 	void finishShow();
 
+	void handlePressForChatPreview(PeerId id, Fn<void()> cancelPress);
+
 	const not_null<Window::SessionController*> _controller;
 
 	const std::unique_ptr<Ui::SettingsSlider> _tabs;
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 40e758ad2a524..48ec566968f17 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -286,6 +286,8 @@ void TopPeersStrip::stripMousePressEvent(QMouseEvent *e) {
 		entry.ripple->add(e->pos() - QPoint(
 			x + st::topPeersMargin.left(),
 			y + st::topPeersMargin.top()));
+
+		_presses.fire_copy(entry.id);
 	}
 }
 
@@ -304,6 +306,7 @@ void TopPeersStrip::stripMouseMoveEvent(QMouseEvent *e) {
 	if (!_dragging && _mouseDownPosition) {
 		if ((*_lastMousePosition - *_mouseDownPosition).manhattanLength()
 			>= QApplication::startDragDistance()) {
+			_pressCancelled.fire({});
 			if (!_expandAnimation.animating()) {
 				_dragging = true;
 				_startDraggingLeft = _scrollLeft;
@@ -371,6 +374,8 @@ void TopPeersStrip::subscribeUserpic(Entry &entry) {
 }
 
 void TopPeersStrip::stripMouseReleaseEvent(QMouseEvent *e) {
+	_pressCancelled.fire({});
+
 	_lastMousePosition = e->globalPos();
 	const auto guard = gsl::finally([&] {
 		_mouseDownPosition = std::nullopt;
@@ -428,6 +433,29 @@ rpl::producer<uint64> TopPeersStrip::clicks() const {
 	return _clicks.events();
 }
 
+rpl::producer<uint64> TopPeersStrip::pressed() const {
+	return _presses.events();
+}
+
+rpl::producer<> TopPeersStrip::pressCancelled() const {
+	return _pressCancelled.events();
+}
+
+void TopPeersStrip::cancelPress() {
+	const auto pressed = std::exchange(_pressed, -1);
+	if (pressed >= 0) {
+		Assert(pressed < _entries.size());
+		auto &entry = _entries[pressed];
+		if (entry.ripple) {
+			entry.ripple->lastStop();
+		}
+	}
+	if (finishDragging()) {
+		return;
+	}
+	_mouseDownPosition = std::nullopt;
+}
+
 auto TopPeersStrip::showMenuRequests() const
 -> rpl::producer<ShowTopPeerMenuRequest> {
 	return _showMenuRequests.events();
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 23db15d1f27d8..4dddd28909561 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -50,6 +50,8 @@ class TopPeersStrip final : public Ui::RpWidget {
 	[[nodiscard]] bool empty() const;
 	[[nodiscard]] rpl::producer<bool> emptyValue() const;
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
+	[[nodiscard]] rpl::producer<uint64> pressed() const;
+	[[nodiscard]] rpl::producer<> pressCancelled() const;
 	[[nodiscard]] auto showMenuRequests() const
 		-> rpl::producer<ShowTopPeerMenuRequest>;
 	[[nodiscard]] auto scrollToRequests() const
@@ -61,6 +63,7 @@ class TopPeersStrip final : public Ui::RpWidget {
 	bool selectByKeyboard(Qt::Key direction);
 	void deselectByKeyboard();
 	bool chooseRow();
+	void cancelPress();
 
 	uint64 updateFromParentDrag(QPoint globalPosition);
 	void dragLeft();
@@ -114,6 +117,8 @@ class TopPeersStrip final : public Ui::RpWidget {
 	rpl::variable<Ui::LinkButton*> _toggleExpanded = nullptr;
 
 	rpl::event_stream<uint64> _clicks;
+	rpl::event_stream<uint64> _presses;
+	rpl::event_stream<> _pressCancelled;
 	rpl::event_stream<ShowTopPeerMenuRequest> _showMenuRequests;
 	rpl::event_stream<not_null<QWheelEvent*>> _verticalScrollEvents;
 
diff --git a/Telegram/SourceFiles/window/window_chat_preview.cpp b/Telegram/SourceFiles/window/window_chat_preview.cpp
index 24a71c3bcfd8e..60ce98bf6eb0b 100644
--- a/Telegram/SourceFiles/window/window_chat_preview.cpp
+++ b/Telegram/SourceFiles/window/window_chat_preview.cpp
@@ -110,7 +110,7 @@ bool ChatPreviewManager::schedule(
 			cancelScheduled();
 			_menu = nullptr;
 		});
-	} else {
+	} else if (!row.key.history()) {
 		return false;
 	}
 	_scheduled = std::move(row);

From 521c17b76c5139ce81efc822ef0778b8bc8cb8de Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 16:49:59 +0400
Subject: [PATCH 293/400] Show chat previews in suggestions.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  | 20 ++++-
 Telegram/SourceFiles/boxes/peer_list_box.h    | 12 +++
 .../dialogs/ui/dialogs_suggestions.cpp        | 76 ++++++++++++++-----
 3 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index dca4a065bae8a..18120e99f6509 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -36,6 +36,7 @@ For license and copyright information please follow this link:
 #include "styles/style_widgets.h"
 
 #include <xxhash.h> // XXH64.
+#include <QtWidgets/QApplication>
 
 [[nodiscard]] PeerListRowId UniqueRowIdFromString(const QString &d) {
 	return XXH64(d.data(), d.size() * sizeof(ushort), 0);
@@ -1552,13 +1553,24 @@ void PeerListContent::handleMouseMove(QPoint globalPosition) {
 		&& *_lastMousePosition == globalPosition) {
 		return;
 	}
+	if (_trackPressStart
+		&& ((*_trackPressStart - globalPosition).manhattanLength()
+			> QApplication::startDragDistance())) {
+		_trackPressStart = std::nullopt;
+		_controller->rowTrackPressCancel();
+	}
 	selectByMouse(globalPosition);
 }
 
+void PeerListContent::cancelPress() {
+	setPressed(Selected());
+}
+
 void PeerListContent::mousePressEvent(QMouseEvent *e) {
 	_pressButton = e->button();
 	selectByMouse(e->globalPos());
 	setPressed(_selected);
+	_trackPressStart = {};
 	if (auto row = getRow(_selected.index)) {
 		auto updateCallback = [this, row, hint = _selected.index] {
 			updateRow(row, hint);
@@ -1586,8 +1598,11 @@ void PeerListContent::mousePressEvent(QMouseEvent *e) {
 				row->addRipple(_st.item, maskGenerator, point, std::move(updateCallback));
 			}
 		}
+		if (_pressButton == Qt::LeftButton && _controller->rowTrackPress(row)) {
+			_trackPressStart = e->globalPos();
+		}
 	}
-	if (anim::Disabled() && !_selected.element) {
+	if (anim::Disabled() && !_trackPressStart && !_selected.element) {
 		mousePressReleased(e->button());
 	}
 }
@@ -1597,6 +1612,9 @@ void PeerListContent::mouseReleaseEvent(QMouseEvent *e) {
 }
 
 void PeerListContent::mousePressReleased(Qt::MouseButton button) {
+	_trackPressStart = {};
+	_controller->rowTrackPressCancel();
+
 	updateRow(_pressed.index);
 	updateRow(_selected.index);
 
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 4349fd8c60732..eb764d36b8078 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -347,6 +347,7 @@ class PeerListDelegate {
 	virtual void peerListSortRows(Fn<bool(const PeerListRow &a, const PeerListRow &b)> compare) = 0;
 	virtual int peerListPartitionRows(Fn<bool(const PeerListRow &a)> border) = 0;
 	virtual std::shared_ptr<Main::SessionShow> peerListUiShow() = 0;
+	virtual void peerListCancelPress() = 0;
 
 	template <typename PeerDataRange>
 	void peerListAddSelectedPeers(PeerDataRange &&range) {
@@ -478,6 +479,12 @@ class PeerListController : public PeerListSearchDelegate {
 		}
 	}
 
+	virtual bool rowTrackPress(not_null<PeerListRow*> row) {
+		return false;
+	}
+	virtual void rowTrackPressCancel() {
+	}
+
 	virtual void loadMoreRows() {
 	}
 	virtual void itemDeselectedHook(not_null<PeerData*> peer) {
@@ -655,6 +662,7 @@ class PeerListContent : public Ui::RpWidget {
 	void refreshRows();
 
 	void mouseLeftGeometry();
+	void cancelPress();
 
 	void setSearchMode(PeerListSearchMode mode);
 	void changeCheckState(
@@ -829,6 +837,7 @@ class PeerListContent : public Ui::RpWidget {
 	bool _mouseSelection = false;
 	std::optional<QPoint> _lastMousePosition;
 	Qt::MouseButton _pressButton = Qt::LeftButton;
+	std::optional<QPoint> _trackPressStart;
 
 	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
 
@@ -991,6 +1000,9 @@ class PeerListContentDelegate : public PeerListDelegate {
 		not_null<PeerListRow*> row,
 		bool highlightRow,
 		Fn<void(not_null<Ui::PopupMenu*>)> destroyed = nullptr) override;
+	void peerListCancelPress() override {
+		_content->cancelPress();
+	}
 
 protected:
 	not_null<PeerListContent*> content() const {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 28802c811e28f..0b768661eb88a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -86,8 +86,25 @@ class RecentRow final : public PeerListRow {
 
 };
 
+class ControllerWithPreviews : public PeerListController {
+public:
+	explicit ControllerWithPreviews(
+		not_null<Window::SessionController*> window);
+
+	[[nodiscard]] not_null<Window::SessionController*> window() const {
+		return _window;
+	}
+
+	bool rowTrackPress(not_null<PeerListRow*> row) override;
+	void rowTrackPressCancel() override;
+
+private:
+	const not_null<Window::SessionController*> _window;
+
+};
+
 class RecentsController final
-	: public PeerListController
+	: public ControllerWithPreviews
 	, public base::has_weak_ptr {
 public:
 	RecentsController(
@@ -115,7 +132,6 @@ class RecentsController final
 	void subscribeToEvents();
 	[[nodiscard]] Fn<void()> removeAllCallback();
 
-	const not_null<Window::SessionController*> _window;
 	RecentPeersList _recent;
 	rpl::variable<int> _count;
 	rpl::event_stream<not_null<PeerData*>> _chosen;
@@ -138,7 +154,7 @@ class ChannelRow final : public PeerListRow {
 };
 
 class MyChannelsController final
-	: public PeerListController
+	: public ControllerWithPreviews
 	, public base::has_weak_ptr {
 public:
 	explicit MyChannelsController(
@@ -163,7 +179,6 @@ class MyChannelsController final
 	void appendRow(not_null<ChannelData*> channel);
 	void fill(bool force = false);
 
-	const not_null<Window::SessionController*> _window;
 	std::vector<not_null<History*>> _channels;
 	rpl::variable<Ui::RpWidget*> _toggleExpanded = nullptr;
 	rpl::variable<int> _count = 0;
@@ -174,7 +189,7 @@ class MyChannelsController final
 };
 
 class RecommendationsController final
-	: public PeerListController
+	: public ControllerWithPreviews
 	, public base::has_weak_ptr {
 public:
 	explicit RecommendationsController(
@@ -201,7 +216,6 @@ class RecommendationsController final
 	void setupDivider();
 	void appendRow(not_null<ChannelData*> channel);
 
-	const not_null<Window::SessionController*> _window;
 	rpl::variable<int> _count;
 	History *_activeHistory = nullptr;
 	bool _requested = false;
@@ -404,10 +418,36 @@ const style::PeerListItem &ChannelRow::computeSt(
 	return _active ? st::recentPeersItemActive : st::recentPeersItem;
 }
 
+ControllerWithPreviews::ControllerWithPreviews(
+	not_null<Window::SessionController*> window)
+: _window(window) {
+}
+
+bool ControllerWithPreviews::rowTrackPress(not_null<PeerListRow*> row) {
+	const auto peer = row->peer();
+	const auto history = peer->owner().history(peer);
+	if (base::IsAltPressed()) {
+		_window->showChatPreview({ history, FullMsgId() });
+		delegate()->peerListCancelPress();
+		return false;
+	}
+	const auto point = delegate()->peerListLastRowMousePosition();
+	const auto &st = computeListSt().item;
+	if (point && point->x() < st.photoPosition.x() + st.photoSize) {
+		_window->scheduleChatPreview({ history, FullMsgId() });
+		return true;
+	}
+	return false;
+}
+
+void ControllerWithPreviews::rowTrackPressCancel() {
+	_window->cancelScheduledPreview();
+}
+
 RecentsController::RecentsController(
 	not_null<Window::SessionController*> window,
 	RecentPeersList list)
-: _window(window)
+: ControllerWithPreviews(window)
 , _recent(std::move(list)) {
 }
 
@@ -429,7 +469,7 @@ void RecentsController::rowClicked(not_null<PeerListRow*> row) {
 
 Fn<void()> RecentsController::removeAllCallback() {
 	const auto weak = base::make_weak(this);
-	const auto session = &_window->session();
+	const auto session = &this->session();
 	return crl::guard(session, [=] {
 		if (weak) {
 			_count = 0;
@@ -450,7 +490,7 @@ base::unique_qptr<Ui::PopupMenu> RecentsController::rowContextMenu(
 		st::popupMenuWithIcons);
 	const auto peer = row->peer();
 	const auto weak = base::make_weak(this);
-	const auto session = &_window->session();
+	const auto session = &this->session();
 	const auto removeOne = crl::guard(session, [=] {
 		if (weak) {
 			const auto rowId = peer->id.value;
@@ -463,7 +503,7 @@ base::unique_qptr<Ui::PopupMenu> RecentsController::rowContextMenu(
 		session->recentPeers().remove(peer);
 	});
 	FillEntryMenu(Ui::Menu::CreateAddActionCallback(result), {
-		.controller = _window,
+		.controller = window(),
 		.peer = peer,
 		.removeOneText = tr::lng_recent_remove(tr::now),
 		.removeOne = removeOne,
@@ -475,7 +515,7 @@ base::unique_qptr<Ui::PopupMenu> RecentsController::rowContextMenu(
 }
 
 Main::Session &RecentsController::session() const {
-	return _window->session();
+	return window()->session();
 }
 
 QString RecentsController::savedMessagesChatStatus() const {
@@ -496,7 +536,7 @@ void RecentsController::setupDivider() {
 		tr::lng_recent_clear(tr::now),
 		st::searchedBarLink);
 	clear->setClickedCallback(RemoveAllConfirm(
-		_window,
+		window(),
 		tr::lng_recent_clear_sure(tr::now),
 		removeAllCallback()));
 	rpl::combine(
@@ -555,7 +595,7 @@ void RecentsController::subscribeToEvents() {
 
 MyChannelsController::MyChannelsController(
 	not_null<Window::SessionController*> window)
-: _window(window) {
+: ControllerWithPreviews(window) {
 }
 
 void MyChannelsController::prepare() {
@@ -679,7 +719,7 @@ base::unique_qptr<Ui::PopupMenu> MyChannelsController::rowContextMenu(
 	const auto peer = row->peer();
 	const auto addAction = Ui::Menu::CreateAddActionCallback(result);
 	Window::FillDialogsEntryMenu(
-		_window,
+		window(),
 		Dialogs::EntryState{
 			.key = peer->owner().history(peer),
 			.section = Dialogs::EntryState::Section::ContextMenu,
@@ -689,7 +729,7 @@ base::unique_qptr<Ui::PopupMenu> MyChannelsController::rowContextMenu(
 }
 
 Main::Session &MyChannelsController::session() const {
-	return _window->session();
+	return window()->session();
 }
 
 void MyChannelsController::setupDivider() {
@@ -760,7 +800,7 @@ void MyChannelsController::setupDivider() {
 
 RecommendationsController::RecommendationsController(
 	not_null<Window::SessionController*> window)
-: _window(window) {
+: ControllerWithPreviews(window) {
 }
 
 void RecommendationsController::prepare() {
@@ -795,7 +835,7 @@ void RecommendationsController::fill() {
 	delegate()->peerListRefreshRows();
 	_count = delegate()->peerListFullRowsCount();
 
-	_window->activeChatValue() | rpl::start_with_next([=](const Key &key) {
+	window()->activeChatValue() | rpl::start_with_next([=](const Key &key) {
 		const auto history = key.history();
 		if (_activeHistory == history) {
 			return;
@@ -841,7 +881,7 @@ base::unique_qptr<Ui::PopupMenu> RecommendationsController::rowContextMenu(
 }
 
 Main::Session &RecommendationsController::session() const {
-	return _window->session();
+	return window()->session();
 }
 
 void RecommendationsController::setupDivider() {

From 1f0acae151a380a5b9f06e67f7471b07ab4e2f8a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 17:12:51 +0400
Subject: [PATCH 294/400] Show frequent/recent selected when preview.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |  9 ++-
 Telegram/SourceFiles/boxes/peer_list_box.h    |  8 +--
 .../dialogs/ui/dialogs_suggestions.cpp        | 36 ++++------
 .../dialogs/ui/dialogs_suggestions.h          |  2 +-
 .../dialogs/ui/top_peers_strip.cpp            | 72 +++++++++++--------
 .../SourceFiles/dialogs/ui/top_peers_strip.h  |  4 +-
 6 files changed, 71 insertions(+), 60 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 18120e99f6509..c0ea166e015ec 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1562,8 +1562,13 @@ void PeerListContent::handleMouseMove(QPoint globalPosition) {
 	selectByMouse(globalPosition);
 }
 
-void PeerListContent::cancelPress() {
-	setPressed(Selected());
+void PeerListContent::pressLeftToContextMenu(bool shown) {
+	if (shown) {
+		setContexted(_pressed);
+		setPressed(Selected());
+	} else {
+		setContexted(Selected());
+	}
 }
 
 void PeerListContent::mousePressEvent(QMouseEvent *e) {
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index eb764d36b8078..47febc1adf8cc 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -347,7 +347,7 @@ class PeerListDelegate {
 	virtual void peerListSortRows(Fn<bool(const PeerListRow &a, const PeerListRow &b)> compare) = 0;
 	virtual int peerListPartitionRows(Fn<bool(const PeerListRow &a)> border) = 0;
 	virtual std::shared_ptr<Main::SessionShow> peerListUiShow() = 0;
-	virtual void peerListCancelPress() = 0;
+	virtual void peerListPressLeftToContextMenu(bool shown) = 0;
 
 	template <typename PeerDataRange>
 	void peerListAddSelectedPeers(PeerDataRange &&range) {
@@ -662,7 +662,7 @@ class PeerListContent : public Ui::RpWidget {
 	void refreshRows();
 
 	void mouseLeftGeometry();
-	void cancelPress();
+	void pressLeftToContextMenu(bool shown);
 
 	void setSearchMode(PeerListSearchMode mode);
 	void changeCheckState(
@@ -1000,8 +1000,8 @@ class PeerListContentDelegate : public PeerListDelegate {
 		not_null<PeerListRow*> row,
 		bool highlightRow,
 		Fn<void(not_null<Ui::PopupMenu*>)> destroyed = nullptr) override;
-	void peerListCancelPress() override {
-		_content->cancelPress();
+	void peerListPressLeftToContextMenu(bool shown) override {
+		_content->pressLeftToContextMenu(shown);
 	}
 
 protected:
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 0b768661eb88a..179b0888702fb 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -86,7 +86,9 @@ class RecentRow final : public PeerListRow {
 
 };
 
-class ControllerWithPreviews : public PeerListController {
+class ControllerWithPreviews
+	: public PeerListController
+	, public base::has_weak_ptr {
 public:
 	explicit ControllerWithPreviews(
 		not_null<Window::SessionController*> window);
@@ -103,9 +105,7 @@ class ControllerWithPreviews : public PeerListController {
 
 };
 
-class RecentsController final
-	: public ControllerWithPreviews
-	, public base::has_weak_ptr {
+class RecentsController final : public ControllerWithPreviews {
 public:
 	RecentsController(
 		not_null<Window::SessionController*> window,
@@ -153,9 +153,7 @@ class ChannelRow final : public PeerListRow {
 
 };
 
-class MyChannelsController final
-	: public ControllerWithPreviews
-	, public base::has_weak_ptr {
+class MyChannelsController final : public ControllerWithPreviews {
 public:
 	explicit MyChannelsController(
 		not_null<Window::SessionController*> window);
@@ -188,9 +186,7 @@ class MyChannelsController final
 
 };
 
-class RecommendationsController final
-	: public ControllerWithPreviews
-	, public base::has_weak_ptr {
+class RecommendationsController final : public ControllerWithPreviews {
 public:
 	explicit RecommendationsController(
 		not_null<Window::SessionController*> window);
@@ -426,15 +422,17 @@ ControllerWithPreviews::ControllerWithPreviews(
 bool ControllerWithPreviews::rowTrackPress(not_null<PeerListRow*> row) {
 	const auto peer = row->peer();
 	const auto history = peer->owner().history(peer);
+	const auto callback = crl::guard(this, [=](bool shown) {
+		delegate()->peerListPressLeftToContextMenu(shown);
+	});
 	if (base::IsAltPressed()) {
-		_window->showChatPreview({ history, FullMsgId() });
-		delegate()->peerListCancelPress();
+		_window->showChatPreview({ history, FullMsgId() }, callback);
 		return false;
 	}
 	const auto point = delegate()->peerListLastRowMousePosition();
 	const auto &st = computeListSt().item;
 	if (point && point->x() < st.photoPosition.x() + st.photoSize) {
-		_window->scheduleChatPreview({ history, FullMsgId() });
+		_window->scheduleChatPreview({ history, FullMsgId() }, callback);
 		return true;
 	}
 	return false;
@@ -982,8 +980,8 @@ void Suggestions::setupChats() {
 	}, _topPeers->lifetime());
 
 	_topPeers->pressed() | rpl::start_with_next([=](uint64 peerIdRaw) {
-		handlePressForChatPreview(PeerId(peerIdRaw), [=] {
-			_topPeers->cancelPress();
+		handlePressForChatPreview(PeerId(peerIdRaw), [=](bool shown) {
+			_topPeers->pressLeftToContextMenu(shown);
 		});
 	}, _topPeers->lifetime());
 
@@ -1036,12 +1034,8 @@ void Suggestions::setupChats() {
 
 void Suggestions::handlePressForChatPreview(
 		PeerId id,
-		Fn<void()> cancelPress) {
-	const auto callback = crl::guard(this, [=](bool shown) {
-		if (shown) {
-			cancelPress();
-		}
-	});
+		Fn<void(bool)> callback) {
+	callback = crl::guard(this, callback);
 	const auto row = RowDescriptor(
 		_controller->session().data().history(id),
 		FullMsgId());
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index 16e07d15b5f71..734ec554c36b7 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -122,7 +122,7 @@ class Suggestions final : public Ui::RpWidget {
 	void startSlideAnimation();
 	void finishShow();
 
-	void handlePressForChatPreview(PeerId id, Fn<void()> cancelPress);
+	void handlePressForChatPreview(PeerId id, Fn<void(bool)> callback);
 
 	const not_null<Window::SessionController*> _controller;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 48ec566968f17..67cafb98cc78d 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -381,14 +381,7 @@ void TopPeersStrip::stripMouseReleaseEvent(QMouseEvent *e) {
 		_mouseDownPosition = std::nullopt;
 	});
 
-	const auto pressed = std::exchange(_pressed, -1);
-	if (pressed >= 0) {
-		Assert(pressed < _entries.size());
-		auto &entry = _entries[pressed];
-		if (entry.ripple) {
-			entry.ripple->lastStop();
-		}
-	}
+	const auto pressed = clearPressed();
 	if (finishDragging()) {
 		return;
 	}
@@ -400,6 +393,18 @@ void TopPeersStrip::stripMouseReleaseEvent(QMouseEvent *e) {
 	}
 }
 
+int TopPeersStrip::clearPressed() {
+	const auto pressed = std::exchange(_pressed, -1);
+	if (pressed >= 0) {
+		Assert(pressed < _entries.size());
+		auto &entry = _entries[pressed];
+		if (entry.ripple) {
+			entry.ripple->lastStop();
+		}
+	}
+	return pressed;
+}
+
 void TopPeersStrip::updateScrollMax(int newWidth) {
 	if (_expandAnimation.animating()) {
 		return;
@@ -441,15 +446,13 @@ rpl::producer<> TopPeersStrip::pressCancelled() const {
 	return _pressCancelled.events();
 }
 
-void TopPeersStrip::cancelPress() {
-	const auto pressed = std::exchange(_pressed, -1);
-	if (pressed >= 0) {
-		Assert(pressed < _entries.size());
-		auto &entry = _entries[pressed];
-		if (entry.ripple) {
-			entry.ripple->lastStop();
-		}
+void TopPeersStrip::pressLeftToContextMenu(bool shown) {
+	if (!shown) {
+		_contexted = -1;
+		update();
+		return;
 	}
+	_contexted = clearPressed();
 	if (finishDragging()) {
 		return;
 	}
@@ -491,6 +494,9 @@ void TopPeersStrip::removeLocally(uint64 id) {
 	if (_pressed > index) {
 		--_pressed;
 	}
+	if (_contexted > index) {
+		--_contexted;
+	}
 	updateScrollMax();
 	_count = int(_entries.size());
 	update();
@@ -603,8 +609,17 @@ void TopPeersStrip::apply(const TopPeersList &list) {
 	}
 	auto now = std::vector<Entry>();
 
-	auto selectedId = (_selected >= 0) ? _entries[_selected].id : 0;
-	auto pressedId = (_pressed >= 0) ? _entries[_pressed].id : 0;
+	const auto selectedId = (_selected >= 0) ? _entries[_selected].id : 0;
+	const auto pressedId = (_pressed >= 0) ? _entries[_pressed].id : 0;
+	const auto contextedId = (_contexted >= 0) ? _entries[_contexted].id : 0;
+	const auto restoreIndex = [&](uint64 id) {
+		if (!id) {
+			return -1;
+		}
+		const auto i = ranges::find(_entries, id, &Entry::id);
+		return (i != end(_entries)) ? int(i - begin(_entries)) : -1;
+	};
+
 	for (const auto &entry : list.entries) {
 		if (_removed.contains(entry.id)) {
 			continue;
@@ -627,18 +642,9 @@ void TopPeersStrip::apply(const TopPeersList &list) {
 		}
 	}
 	_entries = std::move(now);
-	if (selectedId) {
-		const auto i = ranges::find(_entries, selectedId, &Entry::id);
-		if (i != end(_entries)) {
-			_selected = int(i - begin(_entries));
-		}
-	}
-	if (pressedId) {
-		const auto i = ranges::find(_entries, pressedId, &Entry::id);
-		if (i != end(_entries)) {
-			_pressed = int(i - begin(_entries));
-		}
-	}
+	_selected = restoreIndex(selectedId);
+	_pressed = restoreIndex(pressedId);
+	_contexted = restoreIndex(contextedId);
 	updateScrollMax();
 	unsubscribeUserpics();
 	_count = int(_entries.size());
@@ -736,7 +742,11 @@ void TopPeersStrip::paintStrip(QRect clip) {
 
 		auto x = int(base::SafeRound(-shift + from * fsingle + added));
 		auto y = row * st.height;
-		const auto highlighted = (_pressed >= 0) ? _pressed : _selected;
+		const auto highlighted = (_contexted >= 0)
+			? _contexted
+			: (_pressed >= 0)
+			? _pressed
+			: _selected;
 		for (auto i = from; i != till; ++i) {
 			auto &entry = _entries[i];
 			const auto selected = (i == highlighted);
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
index 4dddd28909561..f33ec722b2810 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.h
@@ -63,7 +63,7 @@ class TopPeersStrip final : public Ui::RpWidget {
 	bool selectByKeyboard(Qt::Key direction);
 	void deselectByKeyboard();
 	bool chooseRow();
-	void cancelPress();
+	void pressLeftToContextMenu(bool shown);
 
 	uint64 updateFromParentDrag(QPoint globalPosition);
 	void dragLeft();
@@ -105,6 +105,7 @@ class TopPeersStrip final : public Ui::RpWidget {
 	[[nodiscard]] QRect innerRounded() const;
 	[[nodiscard]] int scrollLeft() const;
 	[[nodiscard]] Layout currentLayout() const;
+	int clearPressed();
 	void apply(const TopPeersList &list);
 	void apply(Entry &entry, const TopPeersEntry &data);
 
@@ -132,6 +133,7 @@ class TopPeersStrip final : public Ui::RpWidget {
 
 	int _selected = -1;
 	int _pressed = -1;
+	int _contexted = -1;
 	bool _selectionByKeyboard = false;
 	bool _hiddenLocally = false;
 

From 0fffeac8da689d1259e982de9699cac1f0cf36c6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 19:08:04 +0400
Subject: [PATCH 295/400] Fix drag-n-drop forward of selected album.

---
 Telegram/SourceFiles/history/history_inner_widget.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 57f11e6783d1d..c35035854d129 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1738,7 +1738,16 @@ std::unique_ptr<QMimeData> HistoryInner::prepareDrag() {
 		return mimeData;
 	} else if (pressedView) {
 		auto forwardIds = MessageIdsList();
-		if (_mouseCursorState == CursorState::Date) {
+		const auto tryForwardSelection = uponSelected
+			&& !_controller->adaptive().isOneColumn();
+		const auto forwardSelectionState = tryForwardSelection
+			? getSelectionState()
+			: HistoryView::TopBarWidget::SelectedState();
+		if (forwardSelectionState.count > 0
+			&& (forwardSelectionState.count
+				== forwardSelectionState.canForwardCount)) {
+			forwardIds = getSelectedItems();
+		} else if (_mouseCursorState == CursorState::Date) {
 			forwardIds = session().data().itemOrItsGroup(_mouseActionItem);
 		} else if (pressedView->isHiddenByGroup() && pressedHandler) {
 			forwardIds = MessageIdsList(1, _mouseActionItem->fullId());

From a1049ec7ce017ed62b3bba6b14c805b1de1357d4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 19:12:22 +0400
Subject: [PATCH 296/400] Add touchscreen preview to recent / channels.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  | 21 ++++-
 Telegram/SourceFiles/boxes/peer_list_box.h    | 10 +++
 .../dialogs/dialogs_inner_widget.cpp          | 13 +--
 .../dialogs/dialogs_inner_widget.h            |  2 +-
 .../dialogs/ui/dialogs_suggestions.cpp        | 88 ++++++++++++++++++-
 .../dialogs/ui/dialogs_suggestions.h          |  3 +
 .../window/window_chat_preview.cpp            | 16 +++-
 .../SourceFiles/window/window_chat_preview.h  |  7 +-
 .../window/window_session_controller.cpp      | 12 ++-
 .../window/window_session_controller.h        |  6 +-
 10 files changed, 154 insertions(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index c0ea166e015ec..22cc40411ead8 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1556,10 +1556,12 @@ void PeerListContent::handleMouseMove(QPoint globalPosition) {
 	if (_trackPressStart
 		&& ((*_trackPressStart - globalPosition).manhattanLength()
 			> QApplication::startDragDistance())) {
-		_trackPressStart = std::nullopt;
+		_trackPressStart = {};
 		_controller->rowTrackPressCancel();
 	}
-	selectByMouse(globalPosition);
+	if (!_controller->rowTrackPressSkipMouseSelection()) {
+		selectByMouse(globalPosition);
+	}
 }
 
 void PeerListContent::pressLeftToContextMenu(bool shown) {
@@ -1571,13 +1573,24 @@ void PeerListContent::pressLeftToContextMenu(bool shown) {
 	}
 }
 
+bool PeerListContent::trackRowPressFromGlobal(QPoint globalPosition) {
+	selectByMouse(globalPosition);
+	if (const auto row = getRow(_selected.index)) {
+		if (_controller->rowTrackPress(row)) {
+			_trackPressStart = globalPosition;
+			return true;
+		}
+	}
+	return false;
+}
+
 void PeerListContent::mousePressEvent(QMouseEvent *e) {
 	_pressButton = e->button();
 	selectByMouse(e->globalPos());
 	setPressed(_selected);
 	_trackPressStart = {};
-	if (auto row = getRow(_selected.index)) {
-		auto updateCallback = [this, row, hint = _selected.index] {
+	if (const auto row = getRow(_selected.index)) {
+		const auto updateCallback = [this, row, hint = _selected.index] {
 			updateRow(row, hint);
 		};
 		if (_selected.element) {
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 47febc1adf8cc..aa24856e28094 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -347,7 +347,9 @@ class PeerListDelegate {
 	virtual void peerListSortRows(Fn<bool(const PeerListRow &a, const PeerListRow &b)> compare) = 0;
 	virtual int peerListPartitionRows(Fn<bool(const PeerListRow &a)> border) = 0;
 	virtual std::shared_ptr<Main::SessionShow> peerListUiShow() = 0;
+
 	virtual void peerListPressLeftToContextMenu(bool shown) = 0;
+	virtual bool peerListTrackRowPressFromGlobal(QPoint globalPosition) = 0;
 
 	template <typename PeerDataRange>
 	void peerListAddSelectedPeers(PeerDataRange &&range) {
@@ -484,6 +486,9 @@ class PeerListController : public PeerListSearchDelegate {
 	}
 	virtual void rowTrackPressCancel() {
 	}
+	virtual bool rowTrackPressSkipMouseSelection() {
+		return false;
+	}
 
 	virtual void loadMoreRows() {
 	}
@@ -663,6 +668,7 @@ class PeerListContent : public Ui::RpWidget {
 
 	void mouseLeftGeometry();
 	void pressLeftToContextMenu(bool shown);
+	bool trackRowPressFromGlobal(QPoint globalPosition);
 
 	void setSearchMode(PeerListSearchMode mode);
 	void changeCheckState(
@@ -1000,9 +1006,13 @@ class PeerListContentDelegate : public PeerListDelegate {
 		not_null<PeerListRow*> row,
 		bool highlightRow,
 		Fn<void(not_null<Ui::PopupMenu*>)> destroyed = nullptr) override;
+
 	void peerListPressLeftToContextMenu(bool shown) override {
 		_content->pressLeftToContextMenu(shown);
 	}
+	bool peerListTrackRowPressFromGlobal(QPoint globalPosition) override {
+		return _content->trackRowPressFromGlobal(globalPosition);
+	}
 
 protected:
 	not_null<PeerListContent*> content() const {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 343730d18b93d..d0d8b8fe7ff94 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1526,7 +1526,7 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	if (alt && showChatPreview()) {
 		return;
 	} else if (!alt && isUserpicPress()) {
-		scheduleChatPreview();
+		scheduleChatPreview(e->globalPos());
 	}
 
 	if (base::in_range(_collapsedSelected, 0, _collapsedRows.size())) {
@@ -2440,12 +2440,16 @@ void InnerWidget::chatPreviewShown(bool shown, RowDescriptor row) {
 	}
 }
 
-bool InnerWidget::scheduleChatPreview() {
+bool InnerWidget::scheduleChatPreview(QPoint positionOverride) {
 	const auto row = computeChatPreviewRow();
 	const auto callback = crl::guard(this, [=](bool shown) {
 		chatPreviewShown(shown, row);
 	});
-	_chatPreviewScheduled = _controller->scheduleChatPreview(row, callback);
+	_chatPreviewScheduled = _controller->scheduleChatPreview(
+		row,
+		callback,
+		nullptr,
+		positionOverride);
 	return _chatPreviewScheduled;
 }
 
@@ -2544,8 +2548,7 @@ bool InnerWidget::processTouchEvent(not_null<QTouchEvent*> e) {
 			return false;
 		}
 		selectByMouse(*point);
-		const auto onlyUserpic = true;
-		if (isUserpicPress() && scheduleChatPreview()) {
+		if (isUserpicPressOnWide() && scheduleChatPreview(*point)) {
 			_chatPreviewTouchGlobal = point;
 		} else if (!_dragging) {
 			_touchDragStartGlobal = point;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index ccca8eb71883c..9f069c243dd7f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -126,7 +126,7 @@ class InnerWidget final : public Ui::RpWidget {
 	[[nodiscard]] bool isUserpicPress() const;
 	[[nodiscard]] bool isUserpicPressOnWide() const;
 	void cancelChatPreview();
-	bool scheduleChatPreview();
+	bool scheduleChatPreview(QPoint positionOverride);
 	bool showChatPreview();
 	void chatPreviewShown(bool shown, RowDescriptor row = {});
 	bool chooseRow(
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 179b0888702fb..ad6fe1f698f5f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -99,10 +99,17 @@ class ControllerWithPreviews
 
 	bool rowTrackPress(not_null<PeerListRow*> row) override;
 	void rowTrackPressCancel() override;
+	bool rowTrackPressSkipMouseSelection() override;
+
+	bool processTouchEvent(not_null<QTouchEvent*> e);
+	void setupTouchChatPreview(not_null<Ui::ElasticScroll*> scroll);
 
 private:
 	const not_null<Window::SessionController*> _window;
 
+	std::optional<QPoint> _chatPreviewTouchGlobal;
+	rpl::event_stream<> _touchCancelRequests;
+
 };
 
 class RecentsController final : public ControllerWithPreviews {
@@ -426,22 +433,81 @@ bool ControllerWithPreviews::rowTrackPress(not_null<PeerListRow*> row) {
 		delegate()->peerListPressLeftToContextMenu(shown);
 	});
 	if (base::IsAltPressed()) {
-		_window->showChatPreview({ history, FullMsgId() }, callback);
+		_window->showChatPreview(
+			{ history, FullMsgId() },
+			callback,
+			nullptr,
+			_chatPreviewTouchGlobal);
 		return false;
 	}
 	const auto point = delegate()->peerListLastRowMousePosition();
 	const auto &st = computeListSt().item;
 	if (point && point->x() < st.photoPosition.x() + st.photoSize) {
-		_window->scheduleChatPreview({ history, FullMsgId() }, callback);
+		_window->scheduleChatPreview(
+			{ history, FullMsgId() },
+			callback,
+			nullptr,
+			_chatPreviewTouchGlobal);
 		return true;
 	}
 	return false;
 }
 
 void ControllerWithPreviews::rowTrackPressCancel() {
+	_chatPreviewTouchGlobal = {};
 	_window->cancelScheduledPreview();
 }
 
+bool ControllerWithPreviews::rowTrackPressSkipMouseSelection() {
+	return _chatPreviewTouchGlobal.has_value();
+}
+
+bool ControllerWithPreviews::processTouchEvent(not_null<QTouchEvent*> e) {
+	const auto point = e->touchPoints().empty()
+		? std::optional<QPoint>()
+		: e->touchPoints().front().screenPos().toPoint();
+	switch (e->type()) {
+	case QEvent::TouchBegin: {
+		if (!point) {
+			return false;
+		}
+		_chatPreviewTouchGlobal = point;
+		if (!delegate()->peerListTrackRowPressFromGlobal(*point)) {
+			_chatPreviewTouchGlobal = {};
+		}
+	} break;
+
+	case QEvent::TouchUpdate: {
+		if (!point) {
+			return false;
+		}
+		if (_chatPreviewTouchGlobal) {
+			const auto delta = (*_chatPreviewTouchGlobal - *point);
+			if (delta.manhattanLength() > computeListSt().item.photoSize) {
+				rowTrackPressCancel();
+			}
+		}
+	} break;
+
+	case QEvent::TouchEnd:
+	case QEvent::TouchCancel: {
+		if (_chatPreviewTouchGlobal) {
+			rowTrackPressCancel();
+		}
+	} break;
+	}
+	return false;
+}
+
+void ControllerWithPreviews::setupTouchChatPreview(
+		not_null<Ui::ElasticScroll*> scroll) {
+	_touchCancelRequests.events() | rpl::start_with_next([=] {
+		QTouchEvent ev(QEvent::TouchCancel);
+		ev.setTimestamp(crl::now());
+		QGuiApplication::sendEvent(scroll, &ev);
+	}, lifetime());
+}
+
 RecentsController::RecentsController(
 	not_null<Window::SessionController*> window,
 	RecentPeersList list)
@@ -1030,6 +1096,7 @@ void Suggestions::setupChats() {
 	}, _topPeers->lifetime());
 
 	_chatsScroll->setVisible(_tab.current() == Tab::Chats);
+	_chatsScroll->setCustomTouchProcess(_recentProcessTouch);
 }
 
 void Suggestions::handlePressForChatPreview(
@@ -1063,6 +1130,11 @@ void Suggestions::setupChannels() {
 		anim::type::instant);
 
 	_channelsScroll->setVisible(_tab.current() == Tab::Channels);
+	_channelsScroll->setCustomTouchProcess([=](not_null<QTouchEvent*> e) {
+		const auto myChannels = _myChannelsProcessTouch(e);
+		const auto recommendations = _recommendationsProcessTouch(e);
+		return myChannels || recommendations;
+	});
 }
 
 void Suggestions::selectJump(Qt::Key direction, int pageSize) {
@@ -1371,6 +1443,9 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
 	controller->setStyleOverrides(&st::recentPeersList);
 
 	_recentCount = controller->count();
+	_recentProcessTouch = [=](not_null<QTouchEvent*> e) {
+		return controller->processTouchEvent(e);
+	};
 
 	controller->chosen(
 	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
@@ -1419,6 +1494,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecentPeers(
 
 	delegate->setContent(raw);
 	controller->setDelegate(delegate);
+	controller->setupTouchChatPreview(_chatsScroll.get());
 
 	return object_ptr<Ui::SlideWrap<>>(this, std::move(content));
 }
@@ -1474,6 +1550,9 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupMyChannels() {
 	controller->setStyleOverrides(&st::recentPeersList);
 
 	_myChannelsCount = controller->count();
+	_myChannelsProcessTouch = [=](not_null<QTouchEvent*> e) {
+		return controller->processTouchEvent(e);
+	};
 
 	controller->chosen(
 	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
@@ -1535,6 +1614,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupMyChannels() {
 
 	delegate->setContent(raw);
 	controller->setDelegate(delegate);
+	controller->setupTouchChatPreview(_channelsScroll.get());
 
 	return object_ptr<Ui::SlideWrap<>>(this, std::move(content));
 }
@@ -1549,6 +1629,9 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecommendations() {
 	controller->setStyleOverrides(&st::recentPeersList);
 
 	_recommendationsCount = controller->count();
+	_recommendationsProcessTouch = [=](not_null<QTouchEvent*> e) {
+		return controller->processTouchEvent(e);
+	};
 
 	_tab.value() | rpl::filter(
 		rpl::mappers::_1 == Tab::Channels
@@ -1603,6 +1686,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupRecommendations() {
 
 	delegate->setContent(raw);
 	controller->setDelegate(delegate);
+	controller->setupTouchChatPreview(_channelsScroll.get());
 
 	return object_ptr<Ui::SlideWrap<>>(this, std::move(content));
 }
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index 734ec554c36b7..8b33718e6e5cc 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -139,6 +139,7 @@ class Suggestions final : public Ui::RpWidget {
 	Fn<JumpResult(Qt::Key, int)> _recentSelectJump;
 	Fn<uint64(QPoint)> _recentUpdateFromParentDrag;
 	Fn<void()> _recentDragLeft;
+	Fn<bool(not_null<QTouchEvent*>)> _recentProcessTouch;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _recentPeers;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _emptyRecent;
 
@@ -150,6 +151,7 @@ class Suggestions final : public Ui::RpWidget {
 	Fn<JumpResult(Qt::Key, int)> _myChannelsSelectJump;
 	Fn<uint64(QPoint)> _myChannelsUpdateFromParentDrag;
 	Fn<void()> _myChannelsDragLeft;
+	Fn<bool(not_null<QTouchEvent*>)> _myChannelsProcessTouch;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _myChannels;
 
 	rpl::variable<int> _recommendationsCount;
@@ -157,6 +159,7 @@ class Suggestions final : public Ui::RpWidget {
 	Fn<JumpResult(Qt::Key, int)> _recommendationsSelectJump;
 	Fn<uint64(QPoint)> _recommendationsUpdateFromParentDrag;
 	Fn<void()> _recommendationsDragLeft;
+	Fn<bool(not_null<QTouchEvent*>)> _recommendationsProcessTouch;
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _recommendations;
 
 	const not_null<Ui::SlideWrap<Ui::RpWidget>*> _emptyChannels;
diff --git a/Telegram/SourceFiles/window/window_chat_preview.cpp b/Telegram/SourceFiles/window/window_chat_preview.cpp
index 60ce98bf6eb0b..e95d58d4c5750 100644
--- a/Telegram/SourceFiles/window/window_chat_preview.cpp
+++ b/Telegram/SourceFiles/window/window_chat_preview.cpp
@@ -34,7 +34,8 @@ ChatPreviewManager::ChatPreviewManager(
 bool ChatPreviewManager::show(
 		Dialogs::RowDescriptor row,
 		Fn<void(bool shown)> callback,
-		QPointer<QWidget> parentOverride) {
+		QPointer<QWidget> parentOverride,
+		std::optional<QPoint> positionOverride) {
 	cancelScheduled();
 	_topicLifetime.destroy();
 	if (const auto topic = row.key.topic()) {
@@ -94,7 +95,7 @@ bool ChatPreviewManager::show(
 	if (callback) {
 		callback(true);
 	}
-	_menu->popup(QCursor::pos());
+	_menu->popup(positionOverride.value_or(QCursor::pos()));
 
 	return true;
 }
@@ -102,7 +103,8 @@ bool ChatPreviewManager::show(
 bool ChatPreviewManager::schedule(
 		Dialogs::RowDescriptor row,
 		Fn<void(bool shown)> callback,
-		QPointer<QWidget> parentOverride) {
+		QPointer<QWidget> parentOverride,
+		std::optional<QPoint> positionOverride) {
 	cancelScheduled();
 	_topicLifetime.destroy();
 	if (const auto topic = row.key.topic()) {
@@ -116,17 +118,23 @@ bool ChatPreviewManager::schedule(
 	_scheduled = std::move(row);
 	_scheduledCallback = std::move(callback);
 	_scheduledParentOverride = std::move(parentOverride);
+	_scheduledPositionOverride = positionOverride;
 	_timer.callOnce(kChatPreviewDelay);
 	return true;
 }
 
 void ChatPreviewManager::showScheduled() {
-	show(base::take(_scheduled), base::take(_scheduledCallback));
+	show(
+		base::take(_scheduled),
+		base::take(_scheduledCallback),
+		nullptr,
+		base::take(_scheduledPositionOverride));
 }
 
 void ChatPreviewManager::cancelScheduled() {
 	_scheduled = {};
 	_scheduledCallback = nullptr;
+	_scheduledPositionOverride = {};
 	_timer.cancel();
 }
 
diff --git a/Telegram/SourceFiles/window/window_chat_preview.h b/Telegram/SourceFiles/window/window_chat_preview.h
index 6101ac3e99998..3ad2b9de2ae45 100644
--- a/Telegram/SourceFiles/window/window_chat_preview.h
+++ b/Telegram/SourceFiles/window/window_chat_preview.h
@@ -26,11 +26,13 @@ class ChatPreviewManager final {
 	bool show(
 		Dialogs::RowDescriptor row,
 		Fn<void(bool shown)> callback = nullptr,
-		QPointer<QWidget> parentOverride = nullptr);
+		QPointer<QWidget> parentOverride = nullptr,
+		std::optional<QPoint> positionOverride = {});
 	bool schedule(
 		Dialogs::RowDescriptor row,
 		Fn<void(bool shown)> callback = nullptr,
-		QPointer<QWidget> parentOverride = nullptr);
+		QPointer<QWidget> parentOverride = nullptr,
+		std::optional<QPoint> positionOverride = {});
 	void cancelScheduled();
 
 private:
@@ -40,6 +42,7 @@ class ChatPreviewManager final {
 	Dialogs::RowDescriptor _scheduled;
 	Fn<void(bool)> _scheduledCallback;
 	QPointer<QWidget> _scheduledParentOverride;
+	std::optional<QPoint> _scheduledPositionOverride;
 	base::Timer _timer;
 
 	rpl::lifetime _topicLifetime;
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 4a004dce81422..59d12ab358f82 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2979,21 +2979,25 @@ QString SessionController::premiumRef() const {
 bool SessionController::showChatPreview(
 		Dialogs::RowDescriptor row,
 		Fn<void(bool shown)> callback,
-		QPointer<QWidget> parentOverride) {
+		QPointer<QWidget> parentOverride,
+		std::optional<QPoint> positionOverride) {
 	return _chatPreviewManager->show(
 		std::move(row),
 		std::move(callback),
-		std::move(parentOverride));
+		std::move(parentOverride),
+		positionOverride);
 }
 
 bool SessionController::scheduleChatPreview(
 		Dialogs::RowDescriptor row,
 		Fn<void(bool shown)> callback,
-		QPointer<QWidget> parentOverride) {
+	QPointer<QWidget> parentOverride,
+	std::optional<QPoint> positionOverride) {
 	return _chatPreviewManager->schedule(
 		std::move(row),
 		std::move(callback),
-		std::move(parentOverride));
+		std::move(parentOverride),
+		positionOverride);
 }
 
 void SessionController::cancelScheduledPreview() {
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 37f45f86e79b7..35e6909039185 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -604,11 +604,13 @@ class SessionController : public SessionNavigation {
 	bool showChatPreview(
 		Dialogs::RowDescriptor row,
 		Fn<void(bool shown)> callback = nullptr,
-		QPointer<QWidget> parentOverride = nullptr);
+		QPointer<QWidget> parentOverride = nullptr,
+		std::optional<QPoint> positionOverride = {});
 	bool scheduleChatPreview(
 		Dialogs::RowDescriptor row,
 		Fn<void(bool shown)> callback = nullptr,
-		QPointer<QWidget> parentOverride = nullptr);
+		QPointer<QWidget> parentOverride = nullptr,
+		std::optional<QPoint> positionOverride = {});
 	void cancelScheduledPreview();
 
 	[[nodiscard]] bool contentOverlapped(QWidget *w, QPaintEvent *e) const;

From dd0d88ccd3089c6840bceb884f2bc8b5d532702f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 31 May 2024 15:26:19 +0300
Subject: [PATCH 297/400] Fixed userpic views in headers of forwarded messages
 with via bots.

---
 Telegram/SourceFiles/history/history_item_components.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index fd1a04942945e..69b514f537def 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -222,14 +222,17 @@ void HistoryMessageForwarded::create(
 		phrase = tr::lng_forwarded_story(
 			tr::now,
 			lt_user,
-			Ui::Text::Link(phrase.text, QString()), // Link 1.
+			Ui::Text::Wrapped(phrase, EntityType::CustomUrl, QString()), // Link 1.
 			Ui::Text::WithEntities);
 	} else if (via && psaType.isEmpty()) {
+		const auto linkData = Ui::Text::Link(
+			QString(),
+			1).entities.front().data(); // Link 1.
 		if (fromChannel) {
 			phrase = tr::lng_forwarded_channel_via(
 				tr::now,
 				lt_channel,
-				Ui::Text::Link(phrase.text, 1), // Link 1.
+				Ui::Text::Wrapped(phrase, EntityType::CustomUrl, linkData), // Link 1.
 				lt_inline_bot,
 				Ui::Text::Link('@' + via->bot->username(), 2), // Link 2.
 				Ui::Text::WithEntities);
@@ -237,7 +240,7 @@ void HistoryMessageForwarded::create(
 			phrase = tr::lng_forwarded_via(
 				tr::now,
 				lt_user,
-				Ui::Text::Link(phrase.text, 1), // Link 1.
+				Ui::Text::Wrapped(phrase, EntityType::CustomUrl, linkData), // Link 1.
 				lt_inline_bot,
 				Ui::Text::Link('@' + via->bot->username(), 2), // Link 2.
 				Ui::Text::WithEntities);

From 50ce847b316c41adb5b48c7f86739094877593aa Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 31 May 2024 15:12:50 +0300
Subject: [PATCH 298/400] Fixed display of info in media from chat preview.

---
 .../history/view/media/history_view_extended_preview.cpp         | 1 +
 Telegram/SourceFiles/history/view/media/history_view_gif.cpp     | 1 +
 .../history/view/media/history_view_media_grouped.cpp            | 1 +
 .../history/view/media/history_view_media_unwrapped.cpp          | 1 +
 Telegram/SourceFiles/history/view/media/history_view_photo.cpp   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
index 7d5b9f00a462b..60db55c8ce6a7 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
@@ -335,6 +335,7 @@ bool ExtendedPreview::needInfoDisplay() const {
 	return _parent->data()->isSending()
 		|| _parent->data()->hasFailed()
 		|| _parent->isUnderCursor()
+		|| (_parent->delegate()->elementContext() == Context::ChatPreview)
 		|| _parent->isLastAndSelfMessage();
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 000cacbfac3a9..4ae4da8923f11 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -1963,6 +1963,7 @@ bool Gif::needInfoDisplay() const {
 	return _parent->data()->isSending()
 		|| _data->uploading()
 		|| _parent->isUnderCursor()
+		|| (_parent->delegate()->elementContext() == Context::ChatPreview)
 		// Don't show the GIF badge if this message has text.
 		|| (!_parent->hasBubble() && _parent->isLastAndSelfMessage());
 }
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 b1c8ba33d8339..3297ef8c767a3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -827,6 +827,7 @@ bool GroupedMedia::needInfoDisplay() const {
 		&& (_parent->data()->isSending()
 			|| _parent->data()->hasFailed()
 			|| _parent->isUnderCursor()
+			|| (_parent->delegate()->elementContext() == Context::ChatPreview)
 			|| _parent->isLastAndSelfMessage());
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
index beee98df14b0c..237c30b87af8e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
@@ -647,6 +647,7 @@ bool UnwrappedMedia::needInfoDisplay() const {
 		|| _parent->isUnderCursor()
 		|| _parent->rightActionSize()
 		|| _parent->isLastAndSelfMessage()
+		|| (_parent->delegate()->elementContext() == Context::ChatPreview)
 		|| (_parent->hasRightLayout()
 			&& _content->alwaysShowOutTimestamp());
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 869527eceb94e..e5c7877fa7f9a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -823,6 +823,7 @@ bool Photo::needInfoDisplay() const {
 	return _parent->data()->isSending()
 		|| _parent->data()->hasFailed()
 		|| _parent->isUnderCursor()
+		|| (_parent->delegate()->elementContext() == Context::ChatPreview)
 		|| _parent->isLastAndSelfMessage();
 }
 

From ba611d0f2dd71d76f40db1e143ea6feac5264b20 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 31 May 2024 18:58:14 +0300
Subject: [PATCH 299/400] Added initial api support of text phone entity in
 messages.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |   1 +
 .../SourceFiles/api/api_text_entities.cpp     |   9 +-
 .../SourceFiles/core/click_handler_types.h    |   2 +
 .../SourceFiles/core/phone_click_handler.cpp  | 325 ++++++++++++++++++
 .../SourceFiles/core/phone_click_handler.h    |  30 ++
 Telegram/SourceFiles/core/ui_integration.cpp  |   3 +
 Telegram/SourceFiles/history/history_item.cpp |   1 +
 Telegram/lib_ui                               |   2 +-
 9 files changed, 373 insertions(+), 2 deletions(-)
 create mode 100644 Telegram/SourceFiles/core/phone_click_handler.cpp
 create mode 100644 Telegram/SourceFiles/core/phone_click_handler.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 8b081b263729b..1517a952e5db1 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -445,6 +445,8 @@ PRIVATE
     core/launcher.h
     core/local_url_handlers.cpp
     core/local_url_handlers.h
+    core/phone_click_handler.cpp
+    core/phone_click_handler.h
     core/sandbox.cpp
     core/sandbox.h
     core/shortcuts.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1b8491c8503eb..bf8781ace3a4b 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3427,6 +3427,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_add_contact" = "Create";
 "lng_add_contact_button" = "New contact";
 "lng_contacts_header" = "Contacts";
+"lng_menu_not_contact" = "This number is not on Telegram";
 "lng_contacts_hidden_stories" = "Hidden Stories";
 "lng_contacts_stories_status#one" = "{count} story";
 "lng_contacts_stories_status#other" = "{count} stories";
diff --git a/Telegram/SourceFiles/api/api_text_entities.cpp b/Telegram/SourceFiles/api/api_text_entities.cpp
index 93d5cc5f36a70..067cc6c0c1ad7 100644
--- a/Telegram/SourceFiles/api/api_text_entities.cpp
+++ b/Telegram/SourceFiles/api/api_text_entities.cpp
@@ -178,7 +178,11 @@ EntitiesInText EntitiesFromMTP(
 				});
 			}
 		}, [&](const MTPDmessageEntityPhone &d) {
-			// Skipping phones.
+			result.push_back({
+				EntityType::Phone,
+				d.voffset().v,
+				d.vlength().v,
+			});
 		}, [&](const MTPDmessageEntityCashtag &d) {
 			result.push_back({
 				EntityType::Cashtag,
@@ -266,6 +270,9 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 		case EntityType::Email: {
 			v.push_back(MTP_messageEntityEmail(offset, length));
 		} break;
+		case EntityType::Phone: {
+			v.push_back(MTP_messageEntityPhone(offset, length));
+		} break;
 		case EntityType::Hashtag: {
 			v.push_back(MTP_messageEntityHashtag(offset, length));
 		} break;
diff --git a/Telegram/SourceFiles/core/click_handler_types.h b/Telegram/SourceFiles/core/click_handler_types.h
index e064d1e2d41e4..20879a0abe6a9 100644
--- a/Telegram/SourceFiles/core/click_handler_types.h
+++ b/Telegram/SourceFiles/core/click_handler_types.h
@@ -52,6 +52,8 @@ struct ClickHandlerContext {
 };
 Q_DECLARE_METATYPE(ClickHandlerContext);
 
+class PhoneClickHandler;
+
 class HiddenUrlClickHandler : public UrlClickHandler {
 public:
 	HiddenUrlClickHandler(QString url) : UrlClickHandler(url, false) {
diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp
new file mode 100644
index 0000000000000..e510cfa048315
--- /dev/null
+++ b/Telegram/SourceFiles/core/phone_click_handler.cpp
@@ -0,0 +1,325 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "core/phone_click_handler.h"
+
+#include "core/click_handler_types.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "info/profile/info_profile_values.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "mainwidget.h"
+#include "mtproto/sender.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/widgets/menu/menu_item_base.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_calls.h"
+#include "styles/style_chat.h" // popupMenuExpandedSeparator.
+#include "styles/style_menu_icons.h"
+
+namespace {
+
+[[nodiscard]] QString Trim(QString text) {
+	return text
+		.replace('+', QString())
+		.replace(' ', QString())
+		.replace('-', QString());
+}
+
+class ResolvePhoneAction final : public Ui::Menu::ItemBase {
+public:
+	ResolvePhoneAction(
+		not_null<Ui::RpWidget*> parent,
+		const style::Menu &st,
+		const QString &phone,
+		not_null<Window::SessionController*> controller);
+
+	bool isEnabled() const override;
+	not_null<QAction*> action() const override;
+
+	void handleKeyPress(not_null<QKeyEvent*> e) override;
+
+protected:
+	QPoint prepareRippleStartPosition() const override;
+	QImage prepareRippleMask() const override;
+
+	int contentHeight() const override;
+
+private:
+	void prepare();
+	void paint(Painter &p);
+
+	const not_null<QAction*> _dummyAction;
+	const style::Menu &_st;
+	rpl::variable<PeerData*> _peer;
+	rpl::variable<bool> _loaded;
+	Ui::PeerUserpicView _userpicView;
+
+	MTP::Sender _api;
+
+	Ui::Text::String _above;
+	Ui::Text::String _below;
+	int _aboveWidth = 0;
+	int _belowWidth = 0;
+	const int _height = 0;
+
+};
+
+ResolvePhoneAction::ResolvePhoneAction(
+	not_null<Ui::RpWidget*> parent,
+	const style::Menu &st,
+	const QString &phone,
+	not_null<Window::SessionController*> controller)
+: ItemBase(parent, st)
+, _dummyAction(new QAction(parent))
+, _st(st)
+, _api(&controller->session().mtp())
+, _height(rect::m::sum::v(st::groupCallJoinAsPadding)
+	+ st::groupCallJoinAsPhotoSize) {
+	setAcceptBoth(true);
+	initResizeHook(parent->sizeValue());
+	setClickedCallback([=] {
+		if (const auto peer = _peer.current()) {
+			controller->showPeerInfo(peer);
+		}
+	});
+
+	const auto formattedPhone = Trim(phone);
+
+	const auto owner = &controller->session().data();
+
+	if (const auto peer = owner->userByPhone(formattedPhone)) {
+		_peer = peer;
+		_loaded.force_assign(true);
+	} else {
+		_api.request(MTPcontacts_ResolvePhone(
+			MTP_string(phone)
+		)).done([=](const MTPcontacts_ResolvedPeer &result) {
+			result.match([&](const MTPDcontacts_resolvedPeer &data) {
+				owner->processUsers(data.vusers());
+				owner->processChats(data.vchats());
+				if (const auto peerId = peerFromMTP(data.vpeer())) {
+					_peer = owner->peer(peerId);
+				}
+				_loaded.force_assign(true);
+			});
+		}).fail([=](const MTP::Error &error) {
+			if (error.code() == 400) {
+				_peer.force_assign(nullptr);
+				_loaded.force_assign(true);
+			}
+		}).send();
+	}
+
+	paintRequest(
+	) | rpl::start_with_next([=] {
+		Painter p(this);
+		paint(p);
+	}, lifetime());
+
+	enableMouseSelecting();
+	prepare();
+}
+
+void ResolvePhoneAction::paint(Painter &p) {
+	const auto selected = isSelected() && _peer.current();
+	const auto height = contentHeight();
+	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);
+	}
+
+	const auto &padding = st::groupCallJoinAsPadding;
+	const auto textLeft = padding.left()
+		+ st::groupCallJoinAsPhotoSize
+		+ padding.left();
+	if (const auto peer = _peer.current()) {
+		peer->paintUserpic(
+			p,
+			_userpicView,
+			padding.left(),
+			padding.top(),
+			st::groupCallJoinAsPhotoSize);
+		p.setPen(selected ? _st.itemFgOver : _st.itemFg);
+		_above.drawLeftElided(
+			p,
+			textLeft,
+			st::groupCallJoinAsTextTop,
+			width() - textLeft - padding.right(),
+			width());
+		p.setPen(selected ? _st.itemFgShortcutOver : _st.itemFgShortcut);
+		_below.drawLeftElided(
+			p,
+			textLeft,
+			st::groupCallJoinAsNameTop,
+			_belowWidth,
+			width());
+	} else {
+		p.setPen(selected ? _st.itemFgShortcutOver : _st.itemFgShortcut);
+		p.drawText(rect() - padding, _below.toString(), style::al_center);
+	}
+}
+
+void ResolvePhoneAction::prepare() {
+	rpl::combine(
+		tr::lng_context_view_profile(),
+		_peer.value(
+		) | rpl::map([](PeerData *peer) {
+			return peer
+				? Info::Profile::NameValue(peer)
+				: rpl::single(QString());
+		}) | rpl::flatten_latest(),
+		tr::lng_menu_not_contact(),
+		_loaded.value(
+		) | rpl::map([](bool loaded) {
+			return loaded
+				? rpl::single(QString())
+				: tr::lng_contacts_loading();
+		}) | rpl::flatten_latest()
+	) | rpl::start_with_next([=](
+			QString text,
+			QString name,
+			QString no,
+			QString loading) {
+		const auto &padding = st::groupCallJoinAsPadding;
+		QWidget::setAttribute(
+			Qt::WA_TransparentForMouseEvents,
+			!_peer.current());
+		const auto above = name;
+		const auto below = !loading.isEmpty()
+			? loading
+			: name.isEmpty()
+			? no
+			: text;
+		const auto options = kDefaultTextOptions;
+		const auto tempWidth = [&] {
+			_below.setMarkedText(_st.itemStyle, { text }, options);
+			return _below.maxWidth();
+		}();
+		_above.setMarkedText(_st.itemStyle, { above }, options);
+		_below.setMarkedText(_st.itemStyle, { below }, options);
+		const auto textWidth = _above.maxWidth();
+		const auto nameWidth = _below.maxWidth();
+		const auto textLeft = padding.left()
+			+ st::groupCallJoinAsPhotoSize
+			+ padding.left();
+		const auto w = std::clamp(
+			(textLeft + tempWidth + padding.right()),
+			_st.widthMin,
+			_st.widthMax);
+		setMinWidth(w);
+		_aboveWidth = w - textLeft - padding.right();
+		_belowWidth = w
+			- ((loading.isEmpty() && name.isEmpty()) ? 0 : textLeft)
+			- padding.right();
+		update();
+	}, lifetime());
+}
+
+bool ResolvePhoneAction::isEnabled() const {
+	return true;
+}
+
+not_null<QAction*> ResolvePhoneAction::action() const {
+	return _dummyAction;
+}
+
+QPoint ResolvePhoneAction::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos());
+}
+
+QImage ResolvePhoneAction::prepareRippleMask() const {
+	return Ui::RippleAnimation::RectMask(size());
+}
+
+int ResolvePhoneAction::contentHeight() const {
+	return _height;
+}
+
+void ResolvePhoneAction::handleKeyPress(not_null<QKeyEvent*> e) {
+	if (!isSelected() || !_peer.current()) {
+		return;
+	}
+	const auto key = e->key();
+	if (key == Qt::Key_Enter || key == Qt::Key_Return) {
+		setClicked(Ui::Menu::TriggeredSource::Keyboard);
+	}
+}
+
+} // namespace
+
+PhoneClickHandler::PhoneClickHandler(
+	not_null<Main::Session*> session,
+	QString text)
+: _session(session)
+, _text(text) {
+}
+
+void PhoneClickHandler::onClick(ClickContext context) const {
+	if (context.button != Qt::LeftButton) {
+		return;
+	}
+	const auto my = context.other.value<ClickHandlerContext>();
+	const auto controller = my.sessionWindow.get();
+	const auto pos = QCursor::pos();
+	if (!controller) {
+		return;
+	}
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		controller->content(),
+		st::popupMenuWithIcons);
+
+	const auto phone = _text;
+
+#if 0
+	const auto maybeContact = [&]() -> PeerData* {
+		const auto &chats = controller->session().data().contactsList();
+		for (const auto &row : chats->all()) {
+			if (const auto history = row->history()) {
+				if (const auto user = history->peer->asUser()) {
+					if (Trim(user->phone()) == Trim(phone)) {
+						return user;
+					}
+				}
+			}
+		}
+		return nullptr;
+	}();
+#endif
+
+	menu->addAction(tr::lng_profile_copy_phone(tr::now), [=] {
+		TextUtilities::SetClipboardText(
+			TextForMimeData::Simple(phone.trimmed()));
+	}, &st::menuIconCopy);
+
+	menu->addSeparator(&st::popupMenuExpandedSeparator.menu.separator);
+
+	menu->addAction(
+		base::make_unique_q<ResolvePhoneAction>(
+			menu,
+			menu->st().menu,
+			phone,
+			controller));
+
+	menu->popup(pos);
+}
+
+auto PhoneClickHandler::getTextEntity() const -> TextEntity {
+	return { EntityType::Phone };
+}
+
+QString PhoneClickHandler::tooltip() const {
+	return _text;
+}
diff --git a/Telegram/SourceFiles/core/phone_click_handler.h b/Telegram/SourceFiles/core/phone_click_handler.h
new file mode 100644
index 0000000000000..bed2be2c50469
--- /dev/null
+++ b/Telegram/SourceFiles/core/phone_click_handler.h
@@ -0,0 +1,30 @@
+/*
+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/basic_click_handlers.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+class PhoneClickHandler : public ClickHandler {
+public:
+	PhoneClickHandler(not_null<Main::Session*> session, QString text);
+
+	void onClick(ClickContext context) const override;
+
+	TextEntity getTextEntity() const override;
+
+	QString tooltip() const override;
+
+private:
+	const not_null<Main::Session*> _session;
+	QString _text;
+
+};
diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index c1ef63e1b457b..f3de162ce0270 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -23,6 +23,7 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "platform/platform_specific.h"
 #include "boxes/url_auth_box.h"
+#include "core/phone_click_handler.h"
 #include "main/main_account.h"
 #include "main/main_session.h"
 #include "main/main_app_config.h"
@@ -217,6 +218,8 @@ std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
 		return std::make_shared<MonospaceClickHandler>(data.text, data.type);
 	case EntityType::Pre:
 		return std::make_shared<MonospaceClickHandler>(data.text, data.type);
+	case EntityType::Phone:
+		return std::make_shared<PhoneClickHandler>(my->session, data.text);
 	}
 	return Integration::createLinkHandler(data, context);
 }
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 88983c5800bd5..ba8b4fb3969dc 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -3127,6 +3127,7 @@ void HistoryItem::setText(const TextWithEntities &textWithEntities) {
 		auto type = entity.type();
 		if (type == EntityType::Url
 			|| type == EntityType::CustomUrl
+			|| type == EntityType::Phone
 			|| type == EntityType::Email) {
 			_flags |= MessageFlag::HasTextLinks;
 			break;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d0514b2b02204..4440037244bd0 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d0514b2b022043b3777b06d6068232aa4cda7e80
+Subproject commit 4440037244bd0175752b82ee1177c676a5340f5c

From 0c1b487956372076daa7882469676f0cc1314bbd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 21:30:04 +0400
Subject: [PATCH 300/400] Fix dragging of non-leader media.

---
 .../SourceFiles/history/history_inner_widget.cpp    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index c35035854d129..48db2a0770a3a 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1749,12 +1749,13 @@ std::unique_ptr<QMimeData> HistoryInner::prepareDrag() {
 			forwardIds = getSelectedItems();
 		} else if (_mouseCursorState == CursorState::Date) {
 			forwardIds = session().data().itemOrItsGroup(_mouseActionItem);
-		} else if (pressedView->isHiddenByGroup() && pressedHandler) {
-			forwardIds = MessageIdsList(1, _mouseActionItem->fullId());
-		} else if (const auto media = pressedView->media()) {
-			if (media->dragItemByHandler(pressedHandler)) {
-				forwardIds = MessageIdsList(1, _mouseActionItem->fullId());
-			}
+		} else if ((pressedView->isHiddenByGroup() && pressedHandler)
+			|| (pressedView->media()
+				&& pressedView->media()->dragItemByHandler(pressedHandler))) {
+			const auto item = _dragStateItem
+				? _dragStateItem
+				: _mouseActionItem;
+			forwardIds = MessageIdsList(1, item->fullId());
 		}
 		if (forwardIds.empty()) {
 			return nullptr;

From 72d1b43453a4539d95e8b3506e712ce3a6dac4da Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 20:38:04 +0400
Subject: [PATCH 301/400] Version 5.1.

- Send messages with effects.
- Move photo or video captions above the media.
- Chat preview on chat photo long press or Alt+Click.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/version.h          |  6 +++---
 Telegram/build/version                       | 12 ++++++------
 changelog.txt                                |  6 ++++++
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index cc2453f6b1210..48ca038862762 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.0.6.0" />
+    Version="5.1.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 0a0a61d845a71..9be23b2437eb5 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,6,0
- PRODUCTVERSION 5,0,6,0
+ FILEVERSION 5,1,0,0
+ PRODUCTVERSION 5,1,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.0.6.0"
+            VALUE "FileVersion", "5.1.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.6.0"
+            VALUE "ProductVersion", "5.1.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 1b7249bf0bacb..d5cdd825e1a11 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,6,0
- PRODUCTVERSION 5,0,6,0
+ FILEVERSION 5,1,0,0
+ PRODUCTVERSION 5,1,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.0.6.0"
+            VALUE "FileVersion", "5.1.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.0.6.0"
+            VALUE "ProductVersion", "5.1.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 911f4794f3162..fd851cb13bbec 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 = 5000006;
-constexpr auto AppVersionStr = "5.0.6";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 5001000;
+constexpr auto AppVersionStr = "5.1";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 2a02b657bd055..ce0d925cdb930 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5000006
-AppVersionStrMajor 5.0
-AppVersionStrSmall 5.0.6
-AppVersionStr      5.0.6
-BetaChannel        1
+AppVersion         5001000
+AppVersionStrMajor 5.1
+AppVersionStrSmall 5.1
+AppVersionStr      5.1.0
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.0.6.beta
+AppVersionOriginal 5.1
diff --git a/changelog.txt b/changelog.txt
index 70728871a40ff..066269cd4e08b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+5.1 (31.05.24)
+
+- Send messages with effects.
+- Move photo or video captions above the media.
+- Chat preview on chat photo long press or Alt+Click.
+
 5.0.6 beta (30.05.24)
 
 - Fix chat preview with non-default themes.

From 3ba1941808924dc2af1fe7b031a9a3c26eeb2910 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 May 2024 23:03:06 +0400
Subject: [PATCH 302/400] Version 5.1: Fix build on macOS.

---
 Telegram/SourceFiles/boxes/send_credits_box.cpp             | 2 --
 Telegram/SourceFiles/boxes/send_files_box.cpp               | 1 -
 Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp  | 1 -
 Telegram/SourceFiles/core/phone_click_handler.cpp           | 2 --
 .../controls/history_view_compose_media_edit_manager.cpp    | 4 ++--
 .../SourceFiles/history/view/history_view_bottom_info.cpp   | 3 ---
 Telegram/SourceFiles/history/view/history_view_message.cpp  | 6 ------
 .../history/view/media/history_view_extended_preview.cpp    | 2 --
 .../SourceFiles/history/view/media/history_view_photo.cpp   | 2 --
 .../history/view/media/history_view_web_page.cpp            | 1 -
 Telegram/SourceFiles/window/window_peer_menu.cpp            | 2 +-
 11 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 2873b4ffec05b..8820c0c65f6f4 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -106,8 +106,6 @@ void SendCreditsBox(
 		widget->setAttribute(Qt::WA_TransparentForMouseEvents);
 	}
 
-	const auto asd = box->lifetime().make_state<uint64>();
-
 	Ui::AddSkip(content);
 	box->addRow(object_ptr<Ui::CenterWrap<>>(
 		box,
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 112e7543a8d7c..fbaaf561a7896 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -627,7 +627,6 @@ void SendFilesBox::addMenuButton() {
 	const auto top = addTopButton(_st.files.menu);
 	top->setClickedCallback([=] {
 		const auto &tabbed = _st.tabbed;
-		const auto &icons = tabbed.icons;
 		_menu = base::make_unique_q<Ui::PopupMenu>(top, tabbed.menu);
 		const auto position = QCursor::pos();
 		SendMenu::FillSendMenu(
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index bb1278fd8e95a..337658af18686 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -2179,7 +2179,6 @@ auto StickersListWidget::collectCustomRecents() -> std::vector<Sticker> {
 	auto result = std::vector<Sticker>();
 
 	result.reserve(_customRecentIds.size());
-	const auto owner = &session().data();
 	for (const auto &descriptor : _customRecentIds) {
 		if (const auto document = descriptor.document; document->sticker()) {
 			result.push_back(Sticker{ document });
diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp
index e510cfa048315..fc8d50d01e23d 100644
--- a/Telegram/SourceFiles/core/phone_click_handler.cpp
+++ b/Telegram/SourceFiles/core/phone_click_handler.cpp
@@ -210,8 +210,6 @@ void ResolvePhoneAction::prepare() {
 		}();
 		_above.setMarkedText(_st.itemStyle, { above }, options);
 		_below.setMarkedText(_st.itemStyle, { below }, options);
-		const auto textWidth = _above.maxWidth();
-		const auto nameWidth = _below.maxWidth();
 		const auto textLeft = padding.left()
 			+ st::groupCallJoinAsPhotoSize
 			+ padding.left();
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 dd2fa98937435..0f765fe69d7d8 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
@@ -129,8 +129,8 @@ SendMenu::Details MediaEditManager::sendMenuDetails(
 	const auto canMoveCaption = media->allowsEditCaption()
 		&& hasCaptionText
 		&& (editPhoto
-			|| editDocument
-			&& (editDocument->isVideoFile() || editDocument->isGifv()));
+			|| (editDocument
+				&& (editDocument->isVideoFile() || editDocument->isGifv())));
 	return {
 		.spoiler = (!canSaveSpoiler
 			? SendMenu::SpoilerState::None
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index 8af94c73bcb84..42ea80dce46e7 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -191,9 +191,6 @@ ClickHandlerPtr BottomInfo::replayEffectLink(
 
 ClickHandlerPtr BottomInfo::replayEffectLink(
 		not_null<const Message*> view) const {
-	const auto item = view->data();
-	const auto itemId = item->fullId();
-	const auto sessionId = item->history()->session().uniqueId();
 	const auto weak = base::make_weak(view);
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 38b89f061fb57..e8876c6e83ff3 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -585,13 +585,7 @@ void Message::animateReaction(Ui::ReactionFlyAnimationArgs &&args) {
 	}
 
 	if (bubble) {
-		const auto check = factcheckBlock();
-		const auto entry = logEntryOriginal();
-
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
-		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
-
 		auto inner = g;
 		if (_comments) {
 			inner.setHeight(inner.height() - st::historyCommentsButtonHeight);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
index 60db55c8ce6a7..88c405d2eb81d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
@@ -174,10 +174,8 @@ int ExtendedPreview::minWidthForButton() const {
 void ExtendedPreview::draw(Painter &p, const PaintContext &context) const {
 	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 
-	const auto stm = context.messageStyle();
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	auto bubble = _parent->hasBubble();
-	auto captionw = paintw - st::msgPadding.left() - st::msgPadding.right();
 	auto rthumb = style::rtlrect(paintx, painty, paintw, painth, width());
 	const auto inWebPage = (_parent->media() != this);
 	const auto rounding = inWebPage
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index e5c7877fa7f9a..c9721746ac599 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -271,7 +271,6 @@ void Photo::draw(Painter &p, const PaintContext &context) const {
 	_dataMedia->automaticLoad(_realParent->fullId(), _parent->data());
 	const auto st = context.st;
 	const auto sti = context.imageStyle();
-	const auto stm = context.messageStyle();
 	auto loaded = _dataMedia->loaded();
 	auto displayLoading = _data->displayLoading();
 
@@ -286,7 +285,6 @@ void Photo::draw(Painter &p, const PaintContext &context) const {
 		}
 	}
 	const auto radial = isRadialAnimation();
-	const auto botTop = _parent->Get<FakeBotAboutTop>();
 
 	auto rthumb = style::rtlrect(paintx, painty, paintw, painth, width());
 	if (_serviceWidth > 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 44863dd41f861..31e79f46f19f1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -324,7 +324,6 @@ void WebPage::setupAdditionalData() {
 		}
 	} else if (_data->type == WebPageType::Factcheck) {
 		_additionalData = std::make_unique<AdditionalData>(FactcheckData());
-		const auto raw = factcheckData();
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index b1a37190f2e56..d3aecb1c5e74b 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2098,7 +2098,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		}
 		state->menu->setForcedVerticalOrigin(
 			Ui::PopupMenu::VerticalOrigin::Bottom);
-		const auto result = SendMenu::FillSendMenu(
+		SendMenu::FillSendMenu(
 			state->menu.get(),
 			show,
 			SendMenu::Details{ sendMenuType() },

From bb43afdd93202594a9dc22d5150928ec4b053e07 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 10:52:48 +0400
Subject: [PATCH 303/400] Fix search in chat close by "Cancel" link.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 3d73978bf88d3..e8f32d70c8bba 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -347,6 +347,7 @@ Widget::Widget(
 	}, lifetime());
 	_inner->cancelSearchRequests(
 	) | rpl::start_with_next([=] {
+		setInnerFocus(true);
 		applySearchState({});
 	}, lifetime());
 	_inner->chosenRow(

From c681569349011c0e2f9ccdb51e5ab42e0fec6d8c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 10:53:00 +0400
Subject: [PATCH 304/400] Fix info display in video with caption above.

---
 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 4ae4da8923f11..4c8713685bad9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -759,7 +759,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 			}
 		}
 	}
-	if (!unwrapped && bubble) {
+	if (!unwrapped && bubble && !isBubbleBottom()) {
 		p.setPen(stm->historyTextFg);
 		auto top = painty + painth + st::mediaCaptionSkip;
 		if (botTop) {

From 5c83858a503c3f4a39e5276f6f33a99c83bc27de Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 10:58:48 +0400
Subject: [PATCH 305/400] Remove empty space below video without caption.

---
 Telegram/SourceFiles/history/view/media/history_view_gif.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 4c8713685bad9..a781a3ecc4d72 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -269,9 +269,6 @@ QSize Gif::countOptimalSize() {
 			accumulate_max(maxWidth, botTop->maxWidth);
 			minHeight += botTop->height;
 		}
-		if (isBubbleBottom()) {
-			minHeight += st::msgPadding.bottom();
-		}
 	} else if (isUnwrapped()) {
 		const auto item = _parent->data();
 		auto via = item->Get<HistoryMessageVia>();

From 233e80d22d2bf991fe8261bd80a7b1f131f29918 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 3 May 2024 20:17:43 +0300
Subject: [PATCH 306/400] Fixed display of confirmation box for proxy links in
 correspond window.

---
 Telegram/SourceFiles/boxes/connection_box.cpp | 106 ++++++++++--------
 Telegram/SourceFiles/boxes/connection_box.h   |   5 +
 .../SourceFiles/core/local_url_handlers.cpp   |   2 +
 3 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
index f50ef4b3a1232..93aeba1a8d659 100644
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.cpp
@@ -37,6 +37,7 @@ For license and copyright information please follow this link:
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "boxes/abstract_box.h" // Ui::show().
+#include "window/window_session_controller.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
@@ -1186,59 +1187,68 @@ ProxiesBoxController::ProxiesBoxController(not_null<Main::Account*> account)
 }
 
 void ProxiesBoxController::ShowApplyConfirmation(
+		Window::SessionController *controller,
 		Type type,
 		const QMap<QString, QString> &fields) {
 	const auto proxy = ProxyDataFromFields(type, fields);
-	if (proxy) {
-		static const auto UrlStartRegExp = QRegularExpression(
-			"^https://",
-			QRegularExpression::CaseInsensitiveOption);
-		static const auto UrlEndRegExp = QRegularExpression("/$");
-		const auto displayed = "https://" + proxy.host + "/";
-		const auto parsed = QUrl::fromUserInput(displayed);
-		const auto displayUrl = !UrlClickHandler::IsSuspicious(displayed)
-			? displayed
-			: parsed.isValid()
-			? QString::fromUtf8(parsed.toEncoded())
-			: UrlClickHandler::ShowEncoded(displayed);
-		const auto displayServer = QString(
-			displayUrl
-		).replace(
-			UrlStartRegExp,
-			QString()
-		).replace(UrlEndRegExp, QString());
-		const auto text = tr::lng_sure_enable_socks(
-			tr::now,
-			lt_server,
-			displayServer,
-			lt_port,
-			QString::number(proxy.port))
-			+ (proxy.type == Type::Mtproto
-				? "\n\n" + tr::lng_proxy_sponsor_warning(tr::now)
-				: QString());
-		auto callback = [=](Fn<void()> &&close) {
-			auto &proxies = Core::App().settings().proxy().list();
-			if (!ranges::contains(proxies, proxy)) {
-				proxies.push_back(proxy);
-			}
-			Core::App().setCurrentProxy(
-				proxy,
-				ProxyData::Settings::Enabled);
-			Local::writeSettings();
-			close();
-		};
-		Ui::show(
-			Ui::MakeConfirmBox({
-				.text = text,
-				.confirmed = std::move(callback),
-				.confirmText = tr::lng_sure_enable(),
-			}),
-			Ui::LayerOption::KeepOther);
-	} else {
-		Ui::show(Ui::MakeInformBox(
+	if (!proxy) {
+		auto box = Ui::MakeInformBox(
 			(proxy.status() == ProxyData::Status::Unsupported
 				? tr::lng_proxy_unsupported(tr::now)
-				: tr::lng_proxy_invalid(tr::now))));
+				: tr::lng_proxy_invalid(tr::now)));
+		if (controller) {
+			controller->uiShow()->showBox(std::move(box));
+		} else {
+			Ui::show(std::move(box));
+		}
+		return;
+	}
+	static const auto UrlStartRegExp = QRegularExpression(
+		"^https://",
+		QRegularExpression::CaseInsensitiveOption);
+	static const auto UrlEndRegExp = QRegularExpression("/$");
+	const auto displayed = "https://" + proxy.host + "/";
+	const auto parsed = QUrl::fromUserInput(displayed);
+	const auto displayUrl = !UrlClickHandler::IsSuspicious(displayed)
+		? displayed
+		: parsed.isValid()
+		? QString::fromUtf8(parsed.toEncoded())
+		: UrlClickHandler::ShowEncoded(displayed);
+	const auto displayServer = QString(
+		displayUrl
+	).replace(
+		UrlStartRegExp,
+		QString()
+	).replace(UrlEndRegExp, QString());
+	const auto text = tr::lng_sure_enable_socks(
+		tr::now,
+		lt_server,
+		displayServer,
+		lt_port,
+		QString::number(proxy.port))
+		+ (proxy.type == Type::Mtproto
+			? "\n\n" + tr::lng_proxy_sponsor_warning(tr::now)
+			: QString());
+	auto callback = [=](Fn<void()> &&close) {
+		auto &proxies = Core::App().settings().proxy().list();
+		if (!ranges::contains(proxies, proxy)) {
+			proxies.push_back(proxy);
+		}
+		Core::App().setCurrentProxy(
+			proxy,
+			ProxyData::Settings::Enabled);
+		Local::writeSettings();
+		close();
+	};
+	auto box = Ui::MakeConfirmBox({
+		.text = text,
+		.confirmed = std::move(callback),
+		.confirmText = tr::lng_sure_enable(),
+	});
+	if (controller) {
+		controller->uiShow()->showBox(std::move(box));
+	} else {
+		Ui::show(std::move(box));
 	}
 }
 
diff --git a/Telegram/SourceFiles/boxes/connection_box.h b/Telegram/SourceFiles/boxes/connection_box.h
index e3bbfd0067d08..25da434586d8c 100644
--- a/Telegram/SourceFiles/boxes/connection_box.h
+++ b/Telegram/SourceFiles/boxes/connection_box.h
@@ -30,6 +30,10 @@ namespace Main {
 class Account;
 } // namespace Main
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 class ProxiesBoxController {
 public:
 	using ProxyData = MTP::ProxyData;
@@ -38,6 +42,7 @@ class ProxiesBoxController {
 	explicit ProxiesBoxController(not_null<Main::Account*> account);
 
 	static void ShowApplyConfirmation(
+		Window::SessionController *controller,
 		Type type,
 		const QMap<QString, QString> &fields);
 
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 5440386408787..03c3254ab076d 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -350,6 +350,7 @@ bool ApplySocksProxy(
 		match->captured(1),
 		qthelp::UrlParamNameTransform::ToLower);
 	ProxiesBoxController::ShowApplyConfirmation(
+		controller,
 		MTP::ProxyData::Type::Socks5,
 		params);
 	if (controller) {
@@ -366,6 +367,7 @@ bool ApplyMtprotoProxy(
 		match->captured(1),
 		qthelp::UrlParamNameTransform::ToLower);
 	ProxiesBoxController::ShowApplyConfirmation(
+		controller,
 		MTP::ProxyData::Type::Mtproto,
 		params);
 	if (controller) {

From d9572949f60960f2b825d4399df2921877ff98d1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 3 May 2024 21:01:36 +0300
Subject: [PATCH 307/400] Replaced confirmation box for proxy links with
 generic box.

---
 Telegram/Resources/langs/lang.strings         |  7 ++
 Telegram/SourceFiles/boxes/boxes.style        |  4 ++
 Telegram/SourceFiles/boxes/connection_box.cpp | 68 ++++++++++++-------
 3 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index bf8781ace3a4b..1ce2489af54c4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -304,6 +304,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sure_ban_admin" = "This user is an admin. Are you sure you want to go ahead and restrict them?";
 "lng_sure_enable_socks" = "Are you sure you want to enable this proxy?\n\nServer: {server}\nPort: {port}\n\nYou can change your proxy server later in the Settings (Connection Type).";
 "lng_sure_enable" = "Enable";
+"lng_proxy_box_title" = "Enable proxy";
+"lng_proxy_box_server" = "Server";
+"lng_proxy_box_port" = "Port";
+"lng_proxy_box_secret" = "Secret";
+"lng_proxy_box_status" = "Status";
+"lng_proxy_box_username" = "Username";
+"lng_proxy_box_password" = "Password";
 "lng_proxy_invalid" = "The proxy link is invalid.";
 "lng_proxy_unsupported" = "Your Telegram Desktop version doesn't support this proxy type or the proxy link is invalid. Please update Telegram Desktop to the latest version.";
 
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 6d3d639ba0886..cfd123c9337c6 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -642,6 +642,10 @@ proxyDropdownUpPosition: point(-2px, 20px);
 proxyAboutPadding: margins(22px, 7px, 22px, 14px);
 proxyAboutSponsorPadding: margins(22px, 7px, 22px, 0px);
 
+proxyApplyBoxLabel : FlatLabel(defaultFlatLabel) {
+	maxHeight: 30px;
+}
+
 markdownLinkFieldPadding: margins(22px, 0px, 22px, 10px);
 
 termsContent: FlatLabel(defaultFlatLabel) {
diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
index 93aeba1a8d659..9775ae058c9fc 100644
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.cpp
@@ -11,7 +11,6 @@ For license and copyright information please follow this link:
 #include "base/qthelp_regex.h"
 #include "base/qthelp_url.h"
 #include "core/application.h"
-#include "core/click_handler_types.h"
 #include "core/core_settings.h"
 #include "core/local_url_handlers.h"
 #include "lang/lang_keys.h"
@@ -36,6 +35,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
+#include "ui/vertical_list.h"
 #include "boxes/abstract_box.h" // Ui::show().
 #include "window/window_session_controller.h"
 #include "styles/style_layers.h"
@@ -1220,35 +1220,51 @@ void ProxiesBoxController::ShowApplyConfirmation(
 		UrlStartRegExp,
 		QString()
 	).replace(UrlEndRegExp, QString());
-	const auto text = tr::lng_sure_enable_socks(
-		tr::now,
-		lt_server,
-		displayServer,
-		lt_port,
-		QString::number(proxy.port))
-		+ (proxy.type == Type::Mtproto
-			? "\n\n" + tr::lng_proxy_sponsor_warning(tr::now)
-			: QString());
-	auto callback = [=](Fn<void()> &&close) {
-		auto &proxies = Core::App().settings().proxy().list();
-		if (!ranges::contains(proxies, proxy)) {
-			proxies.push_back(proxy);
+	const auto box = [=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_proxy_box_title());
+		if (type == Type::Mtproto) {
+			box->addRow(object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_proxy_sponsor_warning(),
+				st::boxDividerLabel));
+			Ui::AddSkip(box->verticalLayout());
+			Ui::AddSkip(box->verticalLayout());
 		}
-		Core::App().setCurrentProxy(
-			proxy,
-			ProxyData::Settings::Enabled);
-		Local::writeSettings();
-		close();
+		const auto &stL = st::proxyApplyBoxLabel;
+		const auto &stSubL = st::boxDividerLabel;
+		const auto add = [&](const QString &s, tr::phrase<> phrase) {
+			if (!s.isEmpty()) {
+				box->addRow(object_ptr<Ui::FlatLabel>(box, s, stL));
+				box->addRow(object_ptr<Ui::FlatLabel>(box, phrase(), stSubL));
+				Ui::AddSkip(box->verticalLayout());
+				Ui::AddSkip(box->verticalLayout());
+			}
+		};
+		if (!displayServer.isEmpty()) {
+			add(displayServer, tr::lng_proxy_box_server);
+		}
+		add(QString::number(proxy.port), tr::lng_proxy_box_port);
+		if (type == Type::Socks5) {
+			add(proxy.user, tr::lng_proxy_box_username);
+			add(proxy.password, tr::lng_proxy_box_password);
+		} else if (type == Type::Mtproto) {
+			add(proxy.password, tr::lng_proxy_box_secret);
+		}
+		box->addButton(tr::lng_sure_enable(), [=] {
+			auto &proxies = Core::App().settings().proxy().list();
+			if (!ranges::contains(proxies, proxy)) {
+				proxies.push_back(proxy);
+			}
+			Core::App().setCurrentProxy(proxy, ProxyData::Settings::Enabled);
+			Local::writeSettings();
+			box->closeBox();
+		});
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 	};
-	auto box = Ui::MakeConfirmBox({
-		.text = text,
-		.confirmed = std::move(callback),
-		.confirmText = tr::lng_sure_enable(),
-	});
 	if (controller) {
-		controller->uiShow()->showBox(std::move(box));
+		controller->uiShow()->showBox(Box(box));
 	} else {
-		Ui::show(std::move(box));
+		Ui::show(Box(box));
 	}
 }
 

From 7aef0b0a83c201401df3b587d3d53ddf1fde0c3e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 1 Jun 2024 16:55:01 +0300
Subject: [PATCH 308/400] Fixed frame size of video userpic in short info boxes
 on Retina.

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

diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
index 47afccd2ff5fe..45d30a7ed679f 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -398,7 +398,7 @@ void PeerShortInfoCover::paintRadial(QPainter &p) {
 QImage PeerShortInfoCover::currentVideoFrame() const {
 	const auto size = QSize(_st.size, _st.size);
 	const auto request = Media::Streaming::FrameRequest{
-		.resize = size * style::DevicePixelRatio(),
+		.resize = size,
 		.outer = size,
 	};
 	return (_videoInstance

From e9e347fa6c3b3ea10043d9c7b0d208150be5617d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 20:34:16 +0400
Subject: [PATCH 309/400] Fix crash in stories privacy handling.

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

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 ac381222cd283..aae110eba45d5 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2405,6 +2405,10 @@ void ComposeControls::initWriteRestriction() {
 		updateWrappingVisibility();
 		return;
 	}
+	if (_like && _like->parentWidget() == _writeRestricted.get()) {
+		// Fix a crash because of _like destruction with its parent.
+		_like->setParent(_wrap.get());
+	}
 	_writeRestricted = std::make_unique<Ui::RpWidget>(_parent);
 	_writeRestricted->move(_wrap->pos());
 	_writeRestricted->resizeToWidth(_wrap->widthNoMargins());

From 59c016e4ce9688c41c73d329022e0c64a4d7c39b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 20:39:31 +0400
Subject: [PATCH 310/400] Fix search input not in the end of the query.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index e8f32d70c8bba..73c5ad8395dcc 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3005,7 +3005,9 @@ bool Widget::applySearchState(SearchState state) {
 		controller()->closeFolder();
 	}
 
-	setSearchQuery(_searchState.query);
+	if (_searchState.query != currentSearchQuery()) {
+		setSearchQuery(_searchState.query);
+	}
 	_inner->applySearchState(_searchState);
 
 	if (!_postponeProcessSearchFocusChange) {

From 36766e7546e974ca530ab09c278cc63f1e0b83b1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 21:16:31 +0400
Subject: [PATCH 311/400] Fix collapsed blockquotes in the end of the text.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 4440037244bd0..00cb1e258b3d2 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 4440037244bd0175752b82ee1177c676a5340f5c
+Subproject commit 00cb1e258b3d2bbd42406f9eb3abcf3229e04046

From c1b95afd8897219b26cccd662afa39df6de60c5a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 21:17:09 +0400
Subject: [PATCH 312/400] Fix media spoiler/caption-above edit in
 topics/scheduled.

---
 .../history_view_compose_controls.cpp         | 40 ++++++++++++++++++-
 .../controls/history_view_compose_controls.h  |  1 +
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index aae110eba45d5..cc4a91a1f5b1d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -139,6 +139,8 @@ class FieldHeader final : public Ui::RpWidget {
 	void previewReady(rpl::producer<Controls::WebpageParsed> parsed);
 	void previewUnregister();
 
+	void mediaEditManagerApply(SendMenu::Action action);
+
 	[[nodiscard]] bool isDisplayed() const;
 	[[nodiscard]] bool isEditingMessage() const;
 	[[nodiscard]] bool readyToForward() const;
@@ -150,6 +152,7 @@ class FieldHeader final : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<> editPhotoRequests() const;
 	[[nodiscard]] rpl::producer<> editOptionsRequests() const;
 	[[nodiscard]] MessageToEdit queryToEdit();
+	[[nodiscard]] SendMenu::Details saveMenuDetails(bool hasSendText) const;
 
 	[[nodiscard]] FullReplyTo getDraftReply() const;
 	[[nodiscard]] rpl::producer<> editCancelled() const {
@@ -529,6 +532,10 @@ void FieldHeader::previewUnregister() {
 	_previewLifetime.destroy();
 }
 
+void FieldHeader::mediaEditManagerApply(SendMenu::Action action) {
+	_mediaEditManager.apply(action);
+}
+
 void FieldHeader::paintWebPage(Painter &p, not_null<PeerData*> context) {
 	Expects(!!_preview.parsed);
 
@@ -736,8 +743,12 @@ void FieldHeader::updateControlsGeometry(QSize size) {
 void FieldHeader::editMessage(FullMsgId id, bool photoEditAllowed) {
 	_photoEditAllowed = photoEditAllowed;
 	_editMsgId = id;
-	if (!photoEditAllowed) {
+	if (!id) {
 		_mediaEditManager.cancel();
+	} else if (const auto item = _show->session().data().message(id)) {
+		_mediaEditManager.start(item);
+	}
+	if (!photoEditAllowed) {
 		_inPhotoEdit = false;
 		_inPhotoEditOver.stop();
 	}
@@ -790,6 +801,12 @@ MessageToEdit FieldHeader::queryToEdit() {
 	};
 }
 
+SendMenu::Details FieldHeader::saveMenuDetails(bool hasSendText) const {
+	return isEditingMessage()
+		? _mediaEditManager.sendMenuDetails(hasSendText)
+		: SendMenu::Details();
+}
+
 ComposeControls::ComposeControls(
 	not_null<Ui::RpWidget*> parent,
 	ComposeControlsDescriptor descriptor)
@@ -2208,6 +2225,19 @@ void ComposeControls::initSendButton() {
 		_sendCustomRequests.fire(std::move(options));
 	});
 
+	using namespace SendMenu;
+	const auto sendAction = [=](Action action, Details details) {
+		if (action.type == ActionType::CaptionUp
+			|| action.type == ActionType::CaptionDown
+			|| action.type == ActionType::SpoilerOn
+			|| action.type == ActionType::SpoilerOff) {
+			_header->mediaEditManagerApply(action);
+		} else {
+			SendMenu::DefaultCallback(_show, send)(action, details);
+		}
+	};
+
+
 	SendMenu::SetupMenuAndShortcuts(
 		_send.get(),
 		_show,
@@ -2529,8 +2559,14 @@ SendMenu::Details ComposeControls::sendMenuDetails() const {
 	return !_history ? SendMenu::Details() : _sendMenuDetails();
 }
 
+SendMenu::Details ComposeControls::saveMenuDetails() const {
+	return _header->saveMenuDetails(HasSendText(_field));
+}
+
 SendMenu::Details ComposeControls::sendButtonMenuDetails() const {
-	return (computeSendButtonType() == Ui::SendButton::Type::Send)
+	return (computeSendButtonType() == Ui::SendButton::Type::Save)
+		? saveMenuDetails()
+		: (computeSendButtonType() == Ui::SendButton::Type::Send)
 		? sendMenuDetails()
 		: SendMenu::Details();
 }
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 11e7429e234ca..fb373a0f77820 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -283,6 +283,7 @@ class ComposeControls final {
 
 	[[nodiscard]] auto computeSendButtonType() const;
 	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
+	[[nodiscard]] SendMenu::Details saveMenuDetails() const;
 	[[nodiscard]] SendMenu::Details sendButtonMenuDetails() const;
 
 	[[nodiscard]] auto sendContentRequests(

From b7f165a2593fcf2320a7336ab90dae19db43d741 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 21:53:26 +0400
Subject: [PATCH 313/400] Fix albums with wide captions.

---
 .../history/view/media/history_view_media_grouped.cpp         | 4 ++++
 .../history/view/media/history_view_media_grouped.h           | 1 +
 2 files changed, 5 insertions(+)

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 3297ef8c767a3..8d6583405c0c8 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -801,6 +801,10 @@ QPoint GroupedMedia::resolveCustomInfoRightBottom() const {
 	return QPoint(width() - skipx, height() - skipy);
 }
 
+bool GroupedMedia::enforceBubbleWidth() const {
+	return _mode == Mode::Grid;
+}
+
 bool GroupedMedia::computeNeedBubble() const {
 	Expects(_mode == Mode::Column || _captionItem.has_value());
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
index 5637f65ad9798..84dca4884a428 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
@@ -96,6 +96,7 @@ class GroupedMedia : public Media {
 	bool customHighlight() const override {
 		return true;
 	}
+	bool enforceBubbleWidth() const override;
 
 	void stopAnimation() override;
 	void checkAnimation() override;

From f4abe37dff62c9c3cd0fb75113c4fbac93b21a2c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 21:53:41 +0400
Subject: [PATCH 314/400] Display peer IDs with delimeters.

---
 Telegram/SourceFiles/info/profile/info_profile_actions.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 4dbd1fd331809..18e398a036f40 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -172,8 +172,9 @@ base::options::toggle ShowPeerIdBelowAbout({
 		}
 		value.append(Italic(u"id: "_q));
 		const auto raw = peer->id.value & PeerId::kChatTypeMask;
-		const auto id = QString::number(raw);
-		value.append(Link(Italic(id), "internal:copy:" + id));
+		value.append(Link(
+			Italic(Lang::FormatCountDecimal(raw)),
+			"internal:copy:" + QString::number(raw)));
 		return std::move(value);
 	});
 }

From eac7bf1c4895a0ab457e6ff594002f4c38d1ac57 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 22:02:17 +0400
Subject: [PATCH 315/400] Show "View as Messages" preview on forum preview.

---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index d0d8b8fe7ff94..3216e512cdef8 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1495,8 +1495,6 @@ RowDescriptor InnerWidget::computeChatPreviewRow() const {
 			: 0;
 		if (const auto topic = peer->forumTopicFor(topicId)) {
 			return { topic, FullMsgId() };
-		} else if (peer->isForum() && !result.key.topic()) {
-			return {};
 		}
 	}
 	return { result.key, result.message.fullId };

From 400f0f8785334df7fcb7e4047e0aeb86e5031c93 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 22:09:01 +0400
Subject: [PATCH 316/400] Empty line between description and ID.

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

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 18e398a036f40..3d6fb7675b339 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -168,7 +168,7 @@ base::options::toggle ShowPeerIdBelowAbout({
 		}
 		using namespace Ui::Text;
 		if (!value.empty()) {
-			value.append("\n");
+			value.append("\n\n");
 		}
 		value.append(Italic(u"id: "_q));
 		const auto raw = peer->id.value & PeerId::kChatTypeMask;

From 70fe6497439ecfbb272a6319ba542991717cd430 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 22:31:43 +0400
Subject: [PATCH 317/400] Hide media viewer on macOS when showing IV.

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

diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index ab2e213273527..69df5f772a1d7 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "iv/iv_instance.h"
 
 #include "apiwrap.h"
+#include "base/platform/base_platform_info.h"
 #include "boxes/share_box.h"
 #include "core/application.h"
 #include "core/file_utilities.h"
@@ -741,6 +742,11 @@ void Instance::show(
 		not_null<Main::Session*> session,
 		not_null<Data*> data,
 		QString hash) {
+	if (Platform::IsMac()) {
+		// Otherwise IV is not visible under the media viewer.
+		Core::App().hideMediaView();
+	}
+
 	const auto guard = gsl::finally([&] {
 		requestFull(session, data->id());
 	});

From bb79a0726299d9cb8cc844c5cec979547977f162 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 22:43:19 +0400
Subject: [PATCH 318/400] Move SendMenu additional actions to bottom.

---
 Telegram/SourceFiles/menu/menu_send.cpp | 57 ++++++++++++-------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index a1c8909fbbdde..58328da12326d 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -626,7 +626,34 @@ FillMenuResult FillSendMenu(
 		? *iconsOverride
 		: st::defaultComposeIcons;
 
-	auto toggles = false;
+	if (sending && type != Type::Reminder) {
+		menu->addAction(
+			tr::lng_send_silent_message(tr::now),
+			[=] { action({ Api::SendOptions{ .silent = true } }, details); },
+			&icons.menuMute);
+	}
+	if (sending && type != Type::SilentOnly) {
+		menu->addAction(
+			(type == Type::Reminder
+				? tr::lng_reminder_message(tr::now)
+				: tr::lng_schedule_message(tr::now)),
+			[=] { action({ .type = ActionType::Schedule }, details); },
+			&icons.menuSchedule);
+	}
+	if (sending && type == Type::ScheduledToUser) {
+		menu->addAction(
+			tr::lng_scheduled_send_until_online(tr::now),
+			[=] { action(
+				{ Api::DefaultSendWhenOnlineOptions() },
+				details); },
+			&icons.menuWhenOnline);
+	}
+
+	if ((type != Type::Disabled)
+		&& ((details.spoiler != SpoilerState::None)
+			|| (details.caption != CaptionState::None))) {
+		menu->addSeparator(&st::expandedMenuSeparator);
+	}
 	if (details.spoiler != SpoilerState::None) {
 		const auto spoilered = (details.spoiler == SpoilerState::Enabled);
 		menu->addAction(
@@ -638,7 +665,6 @@ FillMenuResult FillSendMenu(
 				: ActionType::SpoilerOn
 			}, details); },
 			spoilered ? &icons.menuSpoilerOff : &icons.menuSpoiler);
-		toggles = true;
 	}
 	if (details.caption != CaptionState::None) {
 		const auto above = (details.caption == CaptionState::Above);
@@ -651,33 +677,6 @@ FillMenuResult FillSendMenu(
 				: ActionType::CaptionUp
 			}, details); },
 			above ? &icons.menuBelow : &icons.menuAbove);
-		toggles = true;
-	}
-	if (toggles && type != Type::Disabled) {
-		menu->addSeparator(&st::expandedMenuSeparator);
-	}
-
-	if (sending && type != Type::Reminder) {
-		menu->addAction(
-			tr::lng_send_silent_message(tr::now),
-			[=] { action({ Api::SendOptions{ .silent = true } }, details); },
-			&icons.menuMute);
-	}
-	if (sending && type != Type::SilentOnly) {
-		menu->addAction(
-			(type == Type::Reminder
-				? tr::lng_reminder_message(tr::now)
-				: tr::lng_schedule_message(tr::now)),
-			[=] { action({ .type = ActionType::Schedule }, details); },
-			&icons.menuSchedule);
-	}
-	if (sending && type == Type::ScheduledToUser) {
-		menu->addAction(
-			tr::lng_scheduled_send_until_online(tr::now),
-			[=] { action(
-				{ Api::DefaultSendWhenOnlineOptions() },
-				details); },
-			&icons.menuWhenOnline);
 	}
 
 	using namespace HistoryView::Reactions;

From ee680ac1f16be8203a199e62eafc5aa698a068af Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 22:49:51 +0400
Subject: [PATCH 319/400] Don't try adding effects to forwarded messages.

---
 Telegram/SourceFiles/apiwrap.cpp                | 4 +++-
 Telegram/SourceFiles/history/history_widget.cpp | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 181cf26fb5053..ba44006844ad4 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3383,7 +3383,9 @@ void ApiWrap::forwardMessages(
 				.date = HistoryItem::NewMessageDate(action.options),
 				.shortcutId = action.options.shortcutId,
 				.postAuthor = messagePostAuthor,
-				.effectId = action.options.effectId,
+
+				// forwarded messages don't have effects
+				//.effectId = action.options.effectId,
 			}, item);
 			_session->data().registerMessageRandomId(randomId, newId);
 			if (!localIds) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 44c65a048e897..2077077af3f42 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4224,7 +4224,9 @@ SendMenu::Details HistoryWidget::sendMenuDetails() const {
 		: HistoryView::CanScheduleUntilOnline(_peer)
 		? SendMenu::Type::ScheduledToUser
 		: SendMenu::Type::Scheduled;
-	const auto effectAllowed = _peer && _peer->isUser();
+	const auto effectAllowed = _peer
+		&& _peer->isUser()
+		&& (HasSendText(_field) || _previewDrawPreview);
 	return { .type = type, .effectAllowed = effectAllowed };
 }
 

From 26345208a9e53a1ac1ab0a78bcb61a80c6e9a820 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 23:02:29 +0400
Subject: [PATCH 320/400] Fix caption disappearance on album sending.

---
 Telegram/SourceFiles/data/data_session.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index dba1c3d6952c8..c11c2ef8aafcc 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1821,18 +1821,16 @@ rpl::producer<not_null<HistoryItem*>> Session::itemDataChanges() const {
 
 void Session::requestItemTextRefresh(not_null<HistoryItem*> item) {
 	const auto call = [&](not_null<HistoryItem*> item) {
-		if (const auto i = _views.find(item); i != _views.end()) {
-			for (const auto &view : i->second) {
-				view->itemTextUpdated();
-			}
-		}
+		enumerateItemViews(item, [&](not_null<ViewElement*> view) {
+			view->itemTextUpdated();
+		});
+		requestItemResize(item);
 	};
 	if (const auto group = groups().find(item)) {
 		call(group->items.front());
 	} else {
 		call(item);
 	}
-	requestItemResize(item);
 }
 
 void Session::registerHighlightProcess(

From 12eecec501de97183e4870447d48e8b62e0da5e9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 23:21:48 +0400
Subject: [PATCH 321/400] Disable effects for inline results sending.

---
 .../chat_helpers/gifs_list_widget.cpp            | 11 ++++++++++-
 Telegram/SourceFiles/history/history_widget.cpp  | 16 +++++++++++-----
 Telegram/SourceFiles/history/history_widget.h    |  1 +
 .../inline_bots/inline_results_inner.cpp         |  5 ++++-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index ab2fe0b98c342..2021e294348f7 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -390,11 +390,20 @@ base::unique_qptr<Ui::PopupMenu> GifsListWidget::fillContextMenu(
 	const auto send = crl::guard(this, [=](Api::SendOptions options) {
 		selectInlineResult(selected, options, true);
 	});
+	const auto item = _mosaic.maybeItemAt(_selected);
+	const auto isInlineResult = !item->getPhoto()
+		&& !item->getDocument()
+		&& item->getResult();
 	const auto icons = &st().icons;
+	auto copyDetails = details;
+	if (isInlineResult) {
+		// inline results don't have effects
+		copyDetails.effectAllowed = false;
+	}
 	SendMenu::FillSendMenu(
 		menu,
 		_show,
-		details,
+		copyDetails,
 		SendMenu::DefaultCallback(_show, send),
 		icons);
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 2077077af3f42..383a76109db35 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4211,7 +4211,7 @@ void HistoryWidget::sendScheduled(Api::SendOptions initialOptions) {
 		HistoryView::PrepareScheduleBox(
 			_list,
 			controller()->uiShow(),
-			sendMenuDetails(),
+			sendButtonDefaultDetails(),
 			[=](Api::SendOptions options) { send(options); },
 			initialOptions));
 }
@@ -4224,9 +4224,7 @@ SendMenu::Details HistoryWidget::sendMenuDetails() const {
 		: HistoryView::CanScheduleUntilOnline(_peer)
 		? SendMenu::Type::ScheduledToUser
 		: SendMenu::Type::Scheduled;
-	const auto effectAllowed = _peer
-		&& _peer->isUser()
-		&& (HasSendText(_field) || _previewDrawPreview);
+	const auto effectAllowed = _peer && _peer->isUser();
 	return { .type = type, .effectAllowed = effectAllowed };
 }
 
@@ -4257,7 +4255,15 @@ SendMenu::Details HistoryWidget::sendButtonMenuDetails() const {
 	} else if (type != Type::Send) {
 		return {};
 	}
-	return sendMenuDetails();
+	return sendButtonDefaultDetails();
+}
+
+SendMenu::Details HistoryWidget::sendButtonDefaultDetails() const {
+	auto result = sendMenuDetails();
+	if (!HasSendText(_field) && !_previewDrawPreview) {
+		result.effectAllowed = false;
+	}
+	return result;
 }
 
 void HistoryWidget::unblockUser() {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index e9453a6214ba8..e99705f03f004 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -398,6 +398,7 @@ class HistoryWidget final
 	void sendWithModifiers(Qt::KeyboardModifiers modifiers);
 	void sendScheduled(Api::SendOptions initialOptions);
 	[[nodiscard]] SendMenu::Details sendButtonMenuDetails() const;
+	[[nodiscsard]] SendMenu::Details sendButtonDefaultDetails() const;
 	void handlePendingHistoryUpdate();
 	void fullInfoUpdated();
 	void toggleTabbedSelectorMode();
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
index 74219011dc74b..10c6236bf9676 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -329,10 +329,13 @@ void Inner::contextMenuEvent(QContextMenuEvent *e) {
 	if (_selected < 0 || _pressed >= 0) {
 		return;
 	}
-	const auto details = _sendMenuDetails
+	auto details = _sendMenuDetails
 		? _sendMenuDetails()
 		: SendMenu::Details();
 
+	// inline results don't have effects
+	details.effectAllowed = false;
+
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
 		st::popupMenuWithIcons);

From 86778aa4d90390d17b95410e9cb8efd690f97667 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 23:26:02 +0400
Subject: [PATCH 322/400] Fix cancel search glitch with the new search.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 73c5ad8395dcc..085aa802a1e8e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2973,13 +2973,13 @@ bool Widget::applySearchState(SearchState state) {
 	if (queryChanged) {
 		updateLockUnlockVisibility(anim::type::normal);
 		updateLoadMoreChatsVisibility();
-		updateCancelSearch();
 	}
 	if (inChatChanged) {
 		controller()->setSearchInChat(_searchState.inChat);
 		updateSearchTabs();
 	}
 	if (queryChanged || inChatChanged) {
+		updateCancelSearch();
 		updateStoriesVisibility();
 	}
 	updateJumpToDateVisibility();

From bd20a3cfe4b0267720c01e173e47faa084328c89 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 23:35:04 +0400
Subject: [PATCH 323/400] Fix filtered premium sticker effects selection.

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

diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index dcac6a69e7104..11ba8209435f2 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -1116,9 +1116,9 @@ void Selector::createList() {
 		_list->searchQueries(
 		) | rpl::start_with_next([=](std::vector<QString> &&query) {
 			_stickers->applySearchQuery(std::move(query));
+			updateVisibleTopBottom();
 		}, _stickers->lifetime());
 
-
 		rpl::combine(
 			_list->recentShownCount(),
 			_stickers->recentShownCount()

From 51b866293fb81b9eeec63b37b840cf1cb30c17cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 23:40:20 +0400
Subject: [PATCH 324/400] Version 5.1.1.

- Fix caption display on some media.
- Fix collapsed blockquotes rendering.
- Fully close search in chat by "Cancel" click.
- Allow editing caption placement and spoiler in topics.
- Disable effects on forwarded messages and inline results.
---
 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 48ca038862762..da40284a8377b 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.1.0.0" />
+    Version="5.1.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 9be23b2437eb5..e02d029eb3a82 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,1,0,0
- PRODUCTVERSION 5,1,0,0
+ FILEVERSION 5,1,1,0
+ PRODUCTVERSION 5,1,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.1.0.0"
+            VALUE "FileVersion", "5.1.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.0.0"
+            VALUE "ProductVersion", "5.1.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index d5cdd825e1a11..8591989f3bd49 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,1,0,0
- PRODUCTVERSION 5,1,0,0
+ FILEVERSION 5,1,1,0
+ PRODUCTVERSION 5,1,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.1.0.0"
+            VALUE "FileVersion", "5.1.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.0.0"
+            VALUE "ProductVersion", "5.1.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index fd851cb13bbec..8ba762a1ea82b 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 = 5001000;
-constexpr auto AppVersionStr = "5.1";
+constexpr auto AppVersion = 5001001;
+constexpr auto AppVersionStr = "5.1.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index ce0d925cdb930..505809f37ae4a 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5001000
+AppVersion         5001001
 AppVersionStrMajor 5.1
-AppVersionStrSmall 5.1
-AppVersionStr      5.1.0
+AppVersionStrSmall 5.1.1
+AppVersionStr      5.1.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.1
+AppVersionOriginal 5.1.1
diff --git a/changelog.txt b/changelog.txt
index 066269cd4e08b..b07e06e101a6d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+5.1.1 (01.06.24)
+
+- Fix caption display on some media.
+- Fix collapsed blockquotes rendering.
+- Fully close search in chat by "Cancel" click.
+- Allow editing caption placement and spoiler in topics.
+- Disable effects on forwarded messages and inline results.
+
 5.1 (31.05.24)
 
 - Send messages with effects.

From a7bffe7abdfa10871f41ddfbd86c8f70dac1f4a2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 23:58:31 +0400
Subject: [PATCH 325/400] Version 5.1.1: Fix misspelled attribute.

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

diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index e99705f03f004..977415fbafd96 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -398,7 +398,7 @@ class HistoryWidget final
 	void sendWithModifiers(Qt::KeyboardModifiers modifiers);
 	void sendScheduled(Api::SendOptions initialOptions);
 	[[nodiscard]] SendMenu::Details sendButtonMenuDetails() const;
-	[[nodiscsard]] SendMenu::Details sendButtonDefaultDetails() const;
+	[[nodiscard]] SendMenu::Details sendButtonDefaultDetails() const;
 	void handlePendingHistoryUpdate();
 	void fullInfoUpdated();
 	void toggleTabbedSelectorMode();

From f61f649a7ea03f1c2837cf94e23c7210c28dd3c6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 1 Jun 2024 11:19:00 +0400
Subject: [PATCH 326/400] Add a power saving setting for effects.

---
 Telegram/Resources/langs/lang.strings                         | 1 +
 .../history/view/history_view_emoji_interactions.cpp          | 4 +++-
 Telegram/SourceFiles/settings/settings_power_saving.cpp       | 1 +
 Telegram/SourceFiles/ui/power_saving.h                        | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1ce2489af54c4..e027f6da9b495 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -785,6 +785,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_power_chat" = "Animations in Chats";
 "lng_settings_power_chat_background" = "Background rotation";
 "lng_settings_power_chat_spoiler" = "Animated spoiler effect";
+"lng_settings_power_chat_effects" = "Effects in messages";
 "lng_settings_power_calls" = "Animations in Calls";
 "lng_settings_power_ui" = "Interface animations";
 "lng_settings_power_auto" = "Save Power on Low Battery";
diff --git a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
index de775e17df173..456f97cd98895 100644
--- a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
@@ -22,6 +22,7 @@ For license and copyright information please follow this link:
 #include "lottie/lottie_common.h"
 #include "lottie/lottie_single_player.h"
 #include "base/random.h"
+#include "ui/power_saving.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -155,7 +156,8 @@ void EmojiInteractions::play(
 }
 
 void EmojiInteractions::playEffectOnRead(not_null<const Element*> view) {
-	if (view->data()->markEffectWatched()) {
+	const auto flag = PowerSaving::Flag::kChatEffects;
+	if (view->data()->markEffectWatched() && !PowerSaving::On(flag)) {
 		playEffect(view);
 	}
 }
diff --git a/Telegram/SourceFiles/settings/settings_power_saving.cpp b/Telegram/SourceFiles/settings/settings_power_saving.cpp
index 4d523e07a079a..beaf46613426e 100644
--- a/Telegram/SourceFiles/settings/settings_power_saving.cpp
+++ b/Telegram/SourceFiles/settings/settings_power_saving.cpp
@@ -152,6 +152,7 @@ EditFlagsDescriptor<PowerSaving::Flags> PowerSavingLabels() {
 			&st::menuIconChatBubble,
 		},
 		{ kChatSpoiler, tr::lng_settings_power_chat_spoiler(tr::now) },
+		{ kChatEffects, tr::lng_settings_power_chat_effects(tr::now) },
 	};
 	auto calls = std::vector<Label>{
 		{
diff --git a/Telegram/SourceFiles/ui/power_saving.h b/Telegram/SourceFiles/ui/power_saving.h
index f4a2e1dea1297..6a25e379633c7 100644
--- a/Telegram/SourceFiles/ui/power_saving.h
+++ b/Telegram/SourceFiles/ui/power_saving.h
@@ -20,8 +20,9 @@ enum Flag : uint32 {
 	kChatSpoiler = (1U << 7),
 	kCalls = (1U << 8),
 	kEmojiStatus = (1U << 9),
+	kChatEffects = (1U << 10),
 
-	kAll = (1U << 10) - 1,
+	kAll = (1U << 11) - 1,
 };
 inline constexpr bool is_flag_type(Flag) { return true; }
 using Flags = base::flags<Flag>;

From 47e06cf385831dfe645a1a4c554fd5e0feb4e4b3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 2 Jun 2024 10:04:41 +0400
Subject: [PATCH 327/400] Fix dropping invertCaption on reschedule.

---
 Telegram/SourceFiles/api/api_editing.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/api/api_editing.cpp b/Telegram/SourceFiles/api/api_editing.cpp
index b48ead0b8df80..f326275fdfd13 100644
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -205,6 +205,7 @@ void RescheduleMessage(
 		not_null<HistoryItem*> item,
 		SendOptions options) {
 	const auto empty = [] {};
+	options.invertCaption = item->invertMedia();
 	EditMessage(item, options, empty, empty);
 }
 

From 1656a9c3e26fc7bc5fae64bcd64b34202ba401ef Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 2 Jun 2024 10:55:09 +0400
Subject: [PATCH 328/400] Fix bot about title display.

---
 .../history/view/history_view_message.cpp     |  8 ++---
 .../history/view/media/history_view_gif.cpp   | 35 +------------------
 .../history/view/media/history_view_photo.cpp | 13 -------
 3 files changed, 5 insertions(+), 51 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index e8876c6e83ff3..cd10f2399c160 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1012,10 +1012,10 @@ QSize Message::performCountOptimalSize() {
 				accumulate_max(maxWidth, entry->maxWidth());
 				minHeight += entry->minHeight();
 			}
-			if (withVisibleText && botTop) {
-				accumulate_max(maxWidth, botTop->maxWidth);
-				minHeight += botTop->height;
-			}
+		}
+		if (withVisibleText && botTop) {
+			accumulate_max(maxWidth, botTop->maxWidth);
+			minHeight += botTop->height;
 		}
 		accumulate_max(maxWidth, minWidthForMedia());
 	} else if (media) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index a781a3ecc4d72..a04ea9256f410 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -265,10 +265,6 @@ QSize Gif::countOptimalSize() {
 		minHeight = adjustHeightForLessCrop(
 			scaled,
 			{ maxWidth, minHeight });
-		if (const auto botTop = _parent->Get<FakeBotAboutTop>()) {
-			accumulate_max(maxWidth, botTop->maxWidth);
-			minHeight += botTop->height;
-		}
 	} else if (isUnwrapped()) {
 		const auto item = _parent->data();
 		auto via = item->Get<HistoryMessageVia>();
@@ -310,9 +306,6 @@ QSize Gif::countCurrentSize(int newWidth) {
 		newHeight = adjustHeightForLessCrop(
 			scaled,
 			{ newWidth, newHeight });
-		if (botTop) {
-			newHeight += botTop->height;
-		}
 	} else if (isUnwrapped()) {
 		accumulate_max(newWidth, _parent->reactionsOptimalWidth());
 
@@ -408,16 +401,10 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 	const auto rightLayout = _parent->hasRightLayout();
 	const auto inWebPage = (_parent->media() != this);
 	const auto isRound = _data->isVideoMessage();
-	const auto botTop = _parent->Get<FakeBotAboutTop>();
 
 	const auto rounding = inWebPage
 		? std::optional<Ui::BubbleRounding>()
 		: adjustedBubbleRounding();
-	if (bubble) {
-		if (botTop) {
-			painth -= botTop->height;
-		}
-	}
 
 	auto usex = 0, usew = paintw;
 	const auto unwrapped = isUnwrapped();
@@ -756,22 +743,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 			}
 		}
 	}
-	if (!unwrapped && bubble && !isBubbleBottom()) {
-		p.setPen(stm->historyTextFg);
-		auto top = painty + painth + st::mediaCaptionSkip;
-		if (botTop) {
-			auto captionw = paintw
-				- st::msgPadding.left()
-				- st::msgPadding.right();
-			botTop->text.drawLeftElided(
-				p,
-				st::msgPadding.left(),
-				top,
-				captionw,
-				_parent->width());
-			top += botTop->height;
-		}
-	} else if (!inWebPage && !skipDrawingSurrounding) {
+	if (!inWebPage && !skipDrawingSurrounding) {
 		auto fullRight = paintx + usex + usew;
 		auto fullBottom = painty + painth;
 		auto maxRight = _parent->width() - st::msgMargin.left();
@@ -1032,11 +1004,6 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	auto bubble = _parent->hasBubble();
 
-	if (bubble) {
-		if (const auto botTop = _parent->Get<FakeBotAboutTop>()) {
-			painth -= botTop->height;
-		}
-	}
 	const auto rightLayout = _parent->hasRightLayout();
 	const auto inWebPage = (_parent->media() != this);
 	const auto isRound = _data->isVideoMessage();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index c9721746ac599..ed0ded0feae9a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -196,10 +196,6 @@ QSize Photo::countOptimalSize() {
 		minHeight = adjustHeightForLessCrop(
 			dimensions,
 			{ maxWidth, minHeight });
-		if (const auto botTop = _parent->Get<FakeBotAboutTop>()) {
-			accumulate_max(maxWidth, botTop->maxWidth);
-			minHeight += botTop->height;
-		}
 	}
 	return { maxWidth, minHeight };
 }
@@ -234,9 +230,6 @@ QSize Photo::countCurrentSize(int newWidth) {
 		imageHeight = newHeight = adjustHeightForLessCrop(
 			dimensions,
 			{ newWidth, newHeight });
-		if (botTop) {
-			newHeight += botTop->height;
-		}
 	}
 	const auto enlargeInner = st::historyPageEnlargeSize;
 	const auto enlargeOuter = 2 * st::historyPageEnlargeSkip + enlargeInner;
@@ -609,12 +602,6 @@ TextState Photo::textState(QPoint point, StateRequest request) const {
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	auto bubble = _parent->hasBubble();
 
-	if (bubble) {
-		if (const auto botTop = _parent->Get<FakeBotAboutTop>()) {
-			painth -= botTop->height;
-		}
-		painth -= st::mediaCaptionSkip;
-	}
 	if (QRect(paintx, painty, paintw, painth).contains(point)) {
 		ensureDataMediaCreated();
 		result.link = (_spoiler && !_spoiler->revealed)

From 47ce34e987787c1a0e2170dc8e4c7e327201a689 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 2 Jun 2024 22:06:12 +0300
Subject: [PATCH 329/400] Added initial support of vcard from media contacts.

---
 Telegram/Resources/langs/lang.strings         |  15 +++
 .../SourceFiles/data/data_media_types.cpp     |  27 ++--
 Telegram/SourceFiles/data/data_media_types.h  |  24 +++-
 Telegram/SourceFiles/history/history_item.cpp |  49 ++++++-
 .../view/media/history_view_contact.cpp       | 126 +++++++++++++++---
 .../history/view/media/history_view_contact.h |  12 +-
 6 files changed, 216 insertions(+), 37 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e027f6da9b495..0aea70cdb5a1e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -5240,6 +5240,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_search_tab_no_results_retry" = "Try another hashtag.";
 "lng_search_tab_by_hashtag" = "Enter a hashtag to find messages containing it.";
 
+"lng_contact_details_button" = "View Contact";
+"lng_contact_details_title" = "Contact details";
+"lng_contact_details_phone" = "Phone";
+"lng_contact_details_phone_main" = "Main Phone";
+"lng_contact_details_phone_home" = "Home Phone";
+"lng_contact_details_phone_mobile" = "Mobile Phone";
+"lng_contact_details_phone_work" = "Work Phone";
+"lng_contact_details_phone_other" = "Other Phone";
+"lng_contact_details_email" = "Email";
+"lng_contact_details_address" = "Address";
+"lng_contact_details_url" = "URL";
+"lng_contact_details_note" = "Note";
+"lng_contact_details_birthday" = "Birthday";
+"lng_contact_details_organization" = "Organization";
+
 // Wnd specific
 
 "lng_wnd_choose_program_menu" = "Choose Default Program...";
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 3a8dc19434af7..feb8ad16dc037 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -1224,14 +1224,17 @@ MediaContact::MediaContact(
 	UserId userId,
 	const QString &firstName,
 	const QString &lastName,
-	const QString &phoneNumber)
-: Media(parent) {
+	const QString &phoneNumber,
+	const SharedContact::VcardItems &vcardItems)
+: Media(parent)
+, _contact(SharedContact{
+	.userId = userId,
+	.firstName = firstName,
+	.lastName = lastName,
+	.phoneNumber = phoneNumber,
+	.vcardItems = vcardItems,
+}) {
 	parent->history()->owner().registerContactItem(userId, parent);
-
-	_contact.userId = userId;
-	_contact.firstName = firstName;
-	_contact.lastName = lastName;
-	_contact.phoneNumber = phoneNumber;
 }
 
 MediaContact::~MediaContact() {
@@ -1246,7 +1249,8 @@ std::unique_ptr<Media> MediaContact::clone(not_null<HistoryItem*> parent) {
 		_contact.userId,
 		_contact.firstName,
 		_contact.lastName,
-		_contact.phoneNumber);
+		_contact.phoneNumber,
+		_contact.vcardItems);
 }
 
 const SharedContact *MediaContact::sharedContact() const {
@@ -1301,12 +1305,7 @@ std::unique_ptr<HistoryView::Media> MediaContact::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing) {
-	return std::make_unique<HistoryView::Contact>(
-		message,
-		_contact.userId,
-		_contact.firstName,
-		_contact.lastName,
-		_contact.phoneNumber);
+	return std::make_unique<HistoryView::Contact>(message, _contact);
 }
 
 MediaLocation::MediaLocation(
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index c486799cd43a8..d9f0773c02730 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -47,11 +47,30 @@ enum class CallFinishReason : char {
 	Hangup,
 };
 
-struct SharedContact {
+struct SharedContact final {
 	UserId userId = 0;
 	QString firstName;
 	QString lastName;
 	QString phoneNumber;
+
+	enum class VcardItemType {
+		Phone,
+		PhoneMain,
+		PhoneHome,
+		PhoneMobile,
+		PhoneWork,
+		PhoneOther,
+		Email,
+		Address,
+		Url,
+		Note,
+		Birthday,
+		Organization,
+		Name,
+	};
+
+	using VcardItems = base::flat_map<VcardItemType, QString>;
+	VcardItems vcardItems;
 };
 
 struct Call {
@@ -308,7 +327,8 @@ class MediaContact final : public Media {
 		UserId userId,
 		const QString &firstName,
 		const QString &lastName,
-		const QString &phoneNumber);
+		const QString &phoneNumber,
+		const SharedContact::VcardItems &vcardItems);
 	~MediaContact();
 
 	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index ba8b4fb3969dc..5a434c3a644a7 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -211,12 +211,59 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 		const MTPMessageMedia &media) {
 	using Result = std::unique_ptr<Data::Media>;
 	return media.match([&](const MTPDmessageMediaContact &media) -> Result {
+
+		const auto vcardItems = [&] {
+			using Type = Data::SharedContact::VcardItemType;
+			auto items = Data::SharedContact::VcardItems();
+			for (const auto &item : qs(media.vvcard()).split('\n')) {
+				const auto parts = item.split(':');
+				if (parts.size() == 2) {
+					const auto &type = parts.front();
+					const auto &value = parts[1];
+
+					if (type.startsWith("TEL")) {
+						const auto telType = type.contains("PREF")
+							? Type::PhoneMain
+							: type.contains("HOME")
+							? Type::PhoneHome
+							: type.contains("WORK")
+							? Type::PhoneWork
+							: (type.contains("CELL")
+								|| type.contains("MOBILE"))
+							? Type::PhoneMobile
+							: type.contains("OTHER")
+							? Type::PhoneOther
+							: Type::Phone;
+						items[telType] = value;
+					} else if (type.startsWith("EMAIL")) {
+						items[Type::Email] = value;
+					} else if (type.startsWith("URL")) {
+						items[Type::Url] = value;
+					} else if (type.startsWith("NOTE")) {
+						items[Type::Note] = value;
+					} else if (type.startsWith("ORG")) {
+						items[Type::Organization] = value;
+						items[Type::Organization].replace(';', ' ');
+					} else if (type.startsWith("ADR")) {
+						items[Type::Address] = value;
+					} else if (type.startsWith("BDAY")) {
+						items[Type::Birthday] = value;
+					} else if (type.startsWith("N")) {
+						items[Type::Birthday] = value;
+						items[Type::Birthday].replace(';', ' ');
+					}
+				}
+			}
+			return items;
+		}();
+
 		return std::make_unique<Data::MediaContact>(
 			item,
 			media.vuser_id().v,
 			qs(media.vfirst_name()),
 			qs(media.vlast_name()),
-			qs(media.vphone_number()));
+			qs(media.vphone_number()),
+			vcardItems);
 	}, [&](const MTPDmessageMediaGeo &media) -> Result {
 		return media.vgeo().match([&](const MTPDgeoPoint &point) -> Result {
 			return std::make_unique<Data::MediaLocation>(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
index 1e6654abde6b1..d0fbfe7302e93 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "boxes/add_contact_box.h"
 #include "core/click_handler_types.h" // ClickHandlerContext
+#include "data/data_media_types.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "history/history.h"
@@ -18,16 +19,20 @@ For license and copyright information please follow this link:
 #include "history/view/media/history_view_media_common.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "styles/style_boxes.h"
-#include "styles/style_chat.h"
 #include "ui/chat/chat_style.h"
 #include "ui/empty_userpic.h"
+#include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "ui/rect.h"
 #include "ui/text/format_values.h" // Ui::FormatPhone
 #include "ui/text/text_options.h"
+#include "ui/text/text_utilities.h" // Ui::Text::Wrapped.
+#include "ui/vertical_list.h"
 #include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
 
 namespace HistoryView {
 namespace {
@@ -103,33 +108,116 @@ ClickHandlerPtr AddContactClickHandler(not_null<HistoryItem*> item) {
 	return clickHandlerPtr;
 }
 
+[[nodiscard]] Fn<void(not_null<Ui::GenericBox*>)> VcardBoxFactory(
+		const Data::SharedContact::VcardItems &vcardItems) {
+	if (vcardItems.empty()) {
+		return nullptr;
+	}
+	return [=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_contact_details_title());
+		const auto &stL = st::proxyApplyBoxLabel;
+		const auto &stSubL = st::boxDividerLabel;
+		const auto add = [&](const QString &s, tr::phrase<> phrase) {
+			if (!s.isEmpty()) {
+				const auto label = box->addRow(
+					object_ptr<Ui::FlatLabel>(box, s, stL));
+				box->addRow(object_ptr<Ui::FlatLabel>(box, phrase(), stSubL));
+				Ui::AddSkip(box->verticalLayout());
+				Ui::AddSkip(box->verticalLayout());
+				return label;
+			}
+			return (Ui::FlatLabel*)(nullptr);
+		};
+		for (const auto &[type, value] : vcardItems) {
+			using Type = Data::SharedContact::VcardItemType;
+			const auto isPhoneType = (type == Type::Phone)
+				|| (type == Type::PhoneMain)
+				|| (type == Type::PhoneHome)
+				|| (type == Type::PhoneMobile)
+				|| (type == Type::PhoneWork)
+				|| (type == Type::PhoneOther);
+			const auto typePhrase = (type == Type::Phone)
+				? tr::lng_contact_details_phone
+				: (type == Type::PhoneMain)
+				? tr::lng_contact_details_phone_main
+				: (type == Type::PhoneHome)
+				? tr::lng_contact_details_phone_home
+				: (type == Type::PhoneMobile)
+				? tr::lng_contact_details_phone_mobile
+				: (type == Type::PhoneWork)
+				? tr::lng_contact_details_phone_work
+				: (type == Type::PhoneOther)
+				? tr::lng_contact_details_phone_other
+				: (type == Type::Email)
+				? tr::lng_contact_details_email
+				: (type == Type::Address)
+				? tr::lng_contact_details_address
+				: (type == Type::Url)
+				? tr::lng_contact_details_url
+				: (type == Type::Note)
+				? tr::lng_contact_details_note
+				: (type == Type::Birthday)
+				? tr::lng_contact_details_birthday
+				: (type == Type::Organization)
+				? tr::lng_contact_details_organization
+				: tr::lng_payments_info_name;
+			if (const auto label = add(value, typePhrase)) {
+				const auto copyText = isPhoneType
+					? tr::lng_profile_copy_phone
+					: (type == Type::Email)
+					? tr::lng_context_copy_email
+					: (type == Type::Url)
+					? tr::lng_context_copy_link
+					: (type == Type::Name)
+					? tr::lng_profile_copy_fullname
+					: tr::lng_context_copy_text;
+				label->setContextCopyText(copyText(tr::now));
+				if (type == Type::Email) {
+					label->setMarkedText(
+						Ui::Text::Wrapped({ value }, EntityType::Email));
+				} else if (type == Type::Url) {
+					label->setMarkedText(
+						Ui::Text::Wrapped({ value }, EntityType::Url));
+				} else if (isPhoneType) {
+					label->setText(Ui::FormatPhone(value));
+				}
+				using Request = Ui::FlatLabel::ContextMenuRequest;
+				label->setContextMenuHook([=](Request r) {
+					label->fillContextMenu(r.link
+						? r
+						: Request{ .menu = r.menu, .fullSelection = true });
+				});
+			}
+		}
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	};
+}
+
 } // namespace
 
 Contact::Contact(
 	not_null<Element*> parent,
-	UserId userId,
-	const QString &first,
-	const QString &last,
-	const QString &phone)
+	const Data::SharedContact &data)
 : Media(parent)
 , _st(st::historyPagePreview)
 , _pixh(st::contactsPhotoSize)
-, _userId(userId) {
-	history()->owner().registerContactView(userId, parent);
+, _userId(data.userId)
+, _vcardBoxFactory(VcardBoxFactory(data.vcardItems)) {
+	history()->owner().registerContactView(data.userId, parent);
 
 	_nameLine.setText(
 		st::webPageTitleStyle,
 		tr::lng_full_name(
 			tr::now,
 			lt_first_name,
-			first,
+			data.firstName,
 			lt_last_name,
-			last).trimmed(),
+			data.lastName).trimmed(),
 		Ui::WebpageTextTitleOptions());
 
 	_phoneLine.setText(
 		st::webPageDescriptionStyle,
-		Ui::FormatPhone(phone),
+		Ui::FormatPhone(data.phoneNumber),
 		Ui::WebpageTextTitleOptions());
 
 #if 0 // No info.
@@ -188,16 +276,22 @@ QSize Contact::countOptimalSize() {
 			});
 		}
 		_mainButton.link = _buttons.front().link;
-	} else {
-#if 0 // Can't view contact.
-		const auto view = tr::lng_profile_add_contact(tr::now).toUpper();
+	} else if (const auto vcardBoxFactory = _vcardBoxFactory) {
+		const auto view = tr::lng_contact_details_button(tr::now).toUpper();
 		_buttons.push_back({
 			view,
 			st::semiboldFont->width(view),
 			AddContactClickHandler(_parent->data()),
 		});
-#endif
-		_mainButton.link = nullptr;
+		_mainButton.link = std::make_shared<LambdaClickHandler>([=](
+				const ClickContext &context) {
+			const auto my = context.other.value<ClickHandlerContext>();
+			if (const auto controller = my.sessionWindow.get()) {
+				controller->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
+					vcardBoxFactory(box);
+				}));
+			}
+		});
 	}
 
 	const auto padding = inBubblePadding() + innerMargin();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_contact.h b/Telegram/SourceFiles/history/view/media/history_view_contact.h
index 2dd665b946689..ada5877213ac0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_contact.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_contact.h
@@ -10,8 +10,13 @@ For license and copyright information please follow this link:
 #include "history/view/media/history_view_media.h"
 #include "ui/userpic_view.h"
 
+namespace Data {
+struct SharedContact;
+} // namespace Data
+
 namespace Ui {
 class EmptyUserpic;
+class GenericBox;
 class RippleAnimation;
 } // namespace Ui
 
@@ -21,10 +26,7 @@ class Contact final : public Media {
 public:
 	Contact(
 		not_null<Element*> parent,
-		UserId userId,
-		const QString &first,
-		const QString &last,
-		const QString &phone);
+		const Data::SharedContact &data);
 	~Contact();
 
 	void draw(Painter &p, const PaintContext &context) const override;
@@ -76,6 +78,8 @@ class Contact final : public Media {
 	Ui::Text::String _phoneLine;
 	Ui::Text::String _infoLine;
 
+	Fn<void(not_null<Ui::GenericBox*>)> _vcardBoxFactory;
+
 	struct Button {
 		QString text;
 		int width = 0;

From 9c83b8bac5e2090875b38d5efffb5203338ce967 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 2 Jun 2024 23:07:36 +0300
Subject: [PATCH 330/400] Fixed emoji display in reply markup button from bar
 for pinned messages.

---
 .../chat_helpers/chat_helpers.style           |  7 +++++-
 .../SourceFiles/history/history_widget.cpp    | 24 +++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 8439c5eeee8f6..b3f7e73c978f0 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -930,7 +930,12 @@ historyPinnedBotButton: RoundButton(defaultActiveButton) {
 	textTop: 6px;
 	padding: margins(2px, 10px, 10px, 9px);
 }
-historyPinnedBotButtonMaxWidth: 150px;
+historyPinnedBotLabel: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	align: align(center);
+	maxHeight: 30px;
+}
+historyPinnedBotButtonMaxWidth: 120px;
 
 historyToDownPosition: point(12px, 10px);
 historyToDownAbove: icon {{ "history_down_arrow", historyToDownFg }};
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 383a76109db35..a805c547962e1 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -7249,10 +7249,27 @@ void HistoryWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
 		if ((rows.size() == 1) && (rows.front().size() == 1)) {
 			const auto text = rows.front().front().text;
 			if (!text.isEmpty()) {
+				const auto &st = st::historyPinnedBotButton;
 				auto button = object_ptr<Ui::RoundButton>(
 					this,
-					rpl::single(text),
-					st::historyPinnedBotButton);
+					rpl::never<QString>(),
+					st);
+				const auto label = Ui::CreateChild<Ui::FlatLabel>(
+					button.data(),
+					text,
+					st::historyPinnedBotLabel);
+				if (label->width() > st::historyPinnedBotButtonMaxWidth) {
+					label->resizeToWidth(st::historyPinnedBotButtonMaxWidth);
+				}
+				button->setFullWidth(label->width()
+					+ st.padding.left()
+					+ st.padding.right()
+					+ st.height);
+				label->moveToLeft(
+					st.padding.left() + st.height / 2,
+					(button->height() - label->height()) / 2);
+				label->setTextColorOverride(st.textFg->c);
+				label->setAttribute(Qt::WA_TransparentForMouseEvents);
 				button->setTextTransform(
 					Ui::RoundButton::TextTransform::NoTransform);
 				button->setFullRadius(true);
@@ -7262,9 +7279,6 @@ void HistoryWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
 						0,
 						0);
 				});
-				if (button->width() > st::historyPinnedBotButtonMaxWidth) {
-					button->setFullWidth(st::historyPinnedBotButtonMaxWidth);
-				}
 				struct State {
 					base::unique_qptr<Ui::PopupMenu> menu;
 				};

From e978770fbdfc2458315a4f41b10c89e020604ca7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jun 2024 12:48:11 +0400
Subject: [PATCH 331/400] Fix crash in theme IV opening.

---
 .../history/view/media/history_view_web_page.cpp  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 31e79f46f19f1..b05a01ab8db95 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -430,13 +430,6 @@ QSize WebPage::countOptimalSize() {
 			if (!iso2.isEmpty()) {
 				factcheck->hint.link = AboutFactcheckClickHandler(iso2);
 			}
-		} else if (_data->document
-			&& (_data->document->isWallPaper()
-				|| _data->document->isTheme())) {
-			_openl = std::make_shared<DocumentWrappedClickHandler>(
-				std::move(_openl),
-				_data->document,
-				_parent->data()->fullId());
 		} else {
 			_openl = _data->iv
 				? IvClickHandler(_data, original)
@@ -444,6 +437,14 @@ QSize WebPage::countOptimalSize() {
 					_data->url))
 				? std::make_shared<HiddenUrlClickHandler>(_data->url)
 				: std::make_shared<UrlClickHandler>(_data->url, true);
+			if (_data->document
+				&& (_data->document->isWallPaper()
+					|| _data->document->isTheme())) {
+				_openl = std::make_shared<DocumentWrappedClickHandler>(
+					std::move(_openl),
+					_data->document,
+					_parent->data()->fullId());
+			}
 		}
 	}
 

From f91eb65239922852743647dc25d59fa248b81598 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jun 2024 13:40:04 +0400
Subject: [PATCH 332/400] Fix channel reactions editing.

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

diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 7ac1364213203..7fb8c327d9c66 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -516,7 +516,8 @@ TabbedSelector::TabbedSelector(
 			emoji()->showSet(setId);
 			_showRequests.fire({});
 		}, lifetime());
-
+	}
+	if (hasEmojiTab()) {
 		emoji()->refreshEmoji();
 	}
 	//setAttribute(Qt::WA_AcceptTouchEvents);

From f817504d6760ce4e757060ac91d43dba1336723f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jun 2024 13:52:00 +0400
Subject: [PATCH 333/400] Fix formatting drop on zero cursor position.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 00cb1e258b3d2..d0a7ff7734b6f 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 00cb1e258b3d2bbd42406f9eb3abcf3229e04046
+Subproject commit d0a7ff7734b6f887dc6367742c40c50729c032e3

From eafc01e02bb70b8da7002054c01a87fc0e28be81 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jun 2024 14:14:42 +0400
Subject: [PATCH 334/400] Fix small photo display in wide enough chat.

Fixes #28004.
---
 .../history/view/media/history_view_extended_preview.cpp  | 3 +++
 .../SourceFiles/history/view/media/history_view_photo.cpp | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
index 88c405d2eb81d..582e952652ce3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
@@ -163,6 +163,9 @@ QSize ExtendedPreview::countCurrentSize(int newWidth) {
 			_parent->textualMaxWidth());
 		newWidth = qMin(qMax(newWidth, maxWithCaption), thumbMaxWidth);
 	}
+	if (newWidth >= maxWidth()) {
+		newHeight = qMin(newHeight, minHeight());
+	}
 	return { newWidth, newHeight };
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index ed0ded0feae9a..9c5ccd302d4a9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -218,7 +218,6 @@ QSize Photo::countCurrentSize(int newWidth) {
 		maxWidth());
 	newWidth = qMax(pix.width(), minWidth);
 	auto newHeight = qMax(pix.height(), st::minPhotoSize);
-	auto imageHeight = newHeight;
 	if (_parent->hasBubble()) {
 		auto captionMaxWidth = _parent->textualMaxWidth();
 		const auto botTop = _parent->Get<FakeBotAboutTop>();
@@ -227,10 +226,13 @@ QSize Photo::countCurrentSize(int newWidth) {
 		}
 		const auto maxWithCaption = qMin(st::msgMaxWidth, captionMaxWidth);
 		newWidth = qMin(qMax(newWidth, maxWithCaption), thumbMaxWidth);
-		imageHeight = newHeight = adjustHeightForLessCrop(
+		newHeight = adjustHeightForLessCrop(
 			dimensions,
 			{ newWidth, newHeight });
 	}
+	if (newWidth >= maxWidth()) {
+		newHeight = qMin(newHeight, minHeight());
+	}
 	const auto enlargeInner = st::historyPageEnlargeSize;
 	const auto enlargeOuter = 2 * st::historyPageEnlargeSkip + enlargeInner;
 	const auto showEnlarge = (_parent->media() != this)
@@ -238,7 +240,7 @@ QSize Photo::countCurrentSize(int newWidth) {
 		&& _parent->data()->media()->webpage()
 		&& _parent->data()->media()->webpage()->suggestEnlargePhoto()
 		&& (newWidth >= enlargeOuter)
-		&& (imageHeight >= enlargeOuter);
+		&& (newHeight >= enlargeOuter);
 	_showEnlarge = showEnlarge ? 1 : 0;
 	return { newWidth, newHeight };
 }

From e8a929bdbd079d867f151ce3f9cdc1d3c809f598 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jun 2024 15:03:41 +0400
Subject: [PATCH 335/400] Fix bottom info display in media.

---
 .../history/history_inner_widget.cpp          |  6 +++-
 .../view/history_view_replies_section.cpp     |  7 +++--
 .../history/view/media/history_view_gif.cpp   | 31 ++++++++++---------
 .../view/media/history_view_media_grouped.cpp |  4 +--
 .../history/view/media/history_view_photo.cpp |  4 +--
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 48db2a0770a3a..f450af658c0fd 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2451,7 +2451,11 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			const auto quoteOffset = selected.offset;
 			text.replace('&', u"&&"_q);
 			_menu->addAction(text, [=] {
-				if (canSendReply && !base::IsCtrlPressed()) {
+				const auto still = session->data().message(itemId);
+				const auto forceAnotherChat = base::IsCtrlPressed()
+					&& still
+					&& still->allowsForward();
+				if (canSendReply && !forceAnotherChat) {
 					_widget->replyToMessage({
 						.messageId = itemId,
 						.quote = quote,
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 27ff0e4ff66c8..cf2ef8d8168a5 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -331,9 +331,12 @@ RepliesWidget::RepliesWidget(
 			? Data::CanSendAnything(_topic)
 			: Data::CanSendAnything(_history->peer);
 		const auto &to = request.to;
-		if (_joinGroup || !canSendReply || request.forceAnotherChat) {
+		const auto still = _history->owner().message(to.messageId);
+		const auto allowInAnotherChat = still && still->allowsForward();
+		if (allowInAnotherChat
+			&& (_joinGroup || !canSendReply || request.forceAnotherChat)) {
 			Controls::ShowReplyToChatBox(controller->uiShow(), { to });
-		} else {
+		} else if (!_joinGroup && canSendReply) {
 			replyToMessage(to);
 			_composeControls->focus();
 		}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index a04ea9256f410..62dde278dffb7 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -762,7 +762,8 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 				fullRight = maxRight;
 			}
 		}
-		if (isRound || needInfoDisplay()) {
+		if (isRound
+			|| ((!bubble || isBubbleBottom()) && needInfoDisplay())) {
 			_parent->drawInfo(
 				p,
 				context,
@@ -1117,7 +1118,9 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 			? _cancell
 			: _savel;
 	}
-	if (unwrapped || !bubble) {
+	const auto checkBottomInfo = !inWebPage
+		&& (unwrapped || !bubble || isBubbleBottom());
+	if (checkBottomInfo) {
 		auto fullRight = usex + paintx + usew;
 		auto fullBottom = painty + painth;
 		auto maxRight = _parent->width() - st::msgMargin.left();
@@ -1136,19 +1139,17 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 				fullRight = maxRight;
 			}
 		}
-		if (!inWebPage) {
-			const auto bottomInfoResult = _parent->bottomInfoTextState(
-				fullRight,
-				fullBottom,
-				point,
-				(unwrapped
-					? InfoDisplayType::Background
-					: InfoDisplayType::Image));
-			if (bottomInfoResult.link
-				|| bottomInfoResult.cursor != CursorState::None
-				|| bottomInfoResult.customTooltip) {
-				return bottomInfoResult;
-			}
+		const auto bottomInfoResult = _parent->bottomInfoTextState(
+			fullRight,
+			fullBottom,
+			point,
+			(unwrapped
+				? InfoDisplayType::Background
+				: InfoDisplayType::Image));
+		if (bottomInfoResult.link
+			|| bottomInfoResult.cursor != CursorState::None
+			|| bottomInfoResult.customTooltip) {
+			return bottomInfoResult;
 		}
 		if (const auto size = bubble ? std::nullopt : _parent->rightActionSize()) {
 			const auto rightActionWidth = size->width();
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 8d6583405c0c8..6a67bf426dfca 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -396,7 +396,7 @@ void GroupedMedia::draw(Painter &p, const PaintContext &context) const {
 	}
 
 	// date
-	if (_parent->media() == this && isBubbleBottom()) {
+	if (_parent->media() == this && (!_parent->hasBubble() || isBubbleBottom())) {
 		auto fullRight = width();
 		auto fullBottom = height();
 		if (needInfoDisplay()) {
@@ -455,7 +455,7 @@ PointState GroupedMedia::pointState(QPoint point) const {
 TextState GroupedMedia::textState(QPoint point, StateRequest request) const {
 	const auto groupPadding = groupedPadding();
 	auto result = getPartState(point - QPoint(0, groupPadding.top()), request);
-	if (_parent->media() == this) {
+	if (_parent->media() == this && (!_parent->hasBubble() || isBubbleBottom())) {
 		auto fullRight = width();
 		auto fullBottom = height();
 		const auto bottomInfoResult = _parent->bottomInfoTextState(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 9c5ccd302d4a9..db309ee621665 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -364,7 +364,7 @@ void Photo::draw(Painter &p, const PaintContext &context) const {
 	}
 
 	// date
-	if (isBubbleBottom() && !inWebPage) {
+	if (!inWebPage && (!bubble || isBubbleBottom())) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = painty + painth;
 		if (needInfoDisplay()) {
@@ -621,7 +621,7 @@ TextState Photo::textState(QPoint point, StateRequest request) const {
 			result.cursor = CursorState::Enlarge;
 		}
 	}
-	if (isBubbleBottom() && _parent->media() == this) {
+	if (_parent->media() == this && (!_parent->hasBubble() || isBubbleBottom())) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = painty + painth;
 		const auto bottomInfoResult = _parent->bottomInfoTextState(

From 23a13ab54ec9cc9537e5f045f2ab1958c5336b10 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jun 2024 17:13:14 +0400
Subject: [PATCH 336/400] Close chats search when selecting a folder.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 24 +++++++++++--------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 085aa802a1e8e..9965c2ac43644 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -675,9 +675,12 @@ void Widget::setupMoreChatsBar() {
 	controller()->activeChatsFilter(
 	) | rpl::start_with_next([=](FilterId id) {
 		storiesToggleExplicitExpand(false);
-		if (!_searchState.inChat) {
-			cancelSearch();
-		}
+		const auto cancelled = cancelSearch(true);
+		const auto guard = gsl::finally([&] {
+			if (cancelled) {
+				controller()->content()->dialogsCancelled();
+			}
+		});
 
 		if (!id) {
 			_moreChatsBar = nullptr;
@@ -1385,7 +1388,7 @@ void Widget::changeOpenedFolder(Data::Folder *folder, anim::type animated) {
 		return;
 	}
 	changeOpenedSubsection([&] {
-		cancelSearch();
+		cancelSearch(true);
 		closeChildList(anim::type::instant);
 		controller()->closeForum();
 		_openedFolder = folder;
@@ -1439,7 +1442,7 @@ void Widget::changeOpenedForum(Data::Forum *forum, anim::type animated) {
 		return;
 	}
 	changeOpenedSubsection([&] {
-		cancelSearch();
+		cancelSearch(true);
 		closeChildList(anim::type::instant);
 		_openedForum = forum;
 		_searchState.tab = forum
@@ -2777,7 +2780,7 @@ void Widget::showForum(
 		changeOpenedForum(forum, params.animated);
 		return;
 	}
-	cancelSearch();
+	cancelSearch(true);
 	openChildList(forum, params);
 }
 
@@ -3652,17 +3655,18 @@ void Widget::setSearchQuery(const QString &query, int cursorPosition) {
 	}
 }
 
-bool Widget::cancelSearch() {
+bool Widget::cancelSearch(bool forceFullCancel) {
 	cancelSearchRequest();
 	auto updatedState = _searchState;
 	const auto clearingQuery = !updatedState.query.isEmpty();
-	auto clearingInChat = !clearingQuery
+	auto clearingInChat = (forceFullCancel || !clearingQuery)
 		&& (updatedState.inChat
 			|| updatedState.fromPeer
 			|| !updatedState.tags.empty());
 	if (clearingQuery) {
 		updatedState.query = QString();
-	} else if (clearingInChat) {
+	}
+	if (clearingInChat) {
 		if (updatedState.inChat && controller()->adaptive().isOneColumn()) {
 			if (const auto thread = updatedState.inChat.thread()) {
 				controller()->showThread(thread);
@@ -3680,7 +3684,7 @@ bool Widget::cancelSearch() {
 		setInnerFocus(true);
 		clearingInChat = true;
 	}
-	const auto clearSearchFocus = !updatedState.inChat
+	const auto clearSearchFocus = (forceFullCancel || !updatedState.inChat)
 		&& (_searchHasFocus || _searchSuggestionsLocked);
 	if (!updatedState.inChat && _suggestions) {
 		_suggestions->clearPersistance();
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index d7e8edaeb8686..33d239a480d3b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -131,7 +131,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	bool floatPlayerHandleWheelEvent(QEvent *e) override;
 	QRect floatPlayerAvailableRect() override;
 
-	bool cancelSearch();
+	bool cancelSearch(bool forceFullCancel = false);
 	bool cancelSearchByMouseBack();
 
 	QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;

From a6fcc6d51dceb98da3ddbb256dd7a77b85755131 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 3 Jun 2024 17:46:19 +0400
Subject: [PATCH 337/400] Rely on media viewer code to close itself before
 ShowInFolder

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

diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index 1de1e028f9538..21d912f63c8e8 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -7,10 +7,8 @@ For license and copyright information please follow this link:
 */
 #include "core/file_utilities.h"
 
-#include "boxes/abstract_box.h"
 #include "storage/localstorage.h"
 #include "storage/storage_account.h"
-#include "base/platform/base_platform_info.h"
 #include "base/platform/base_platform_file_utilities.h"
 #include "platform/platform_file_utilities.h"
 #include "core/application.h"
@@ -159,10 +157,6 @@ void Launch(const QString &filepath) {
 void ShowInFolder(const QString &filepath) {
 	crl::on_main([=] {
 		Ui::PreventDelayedActivation();
-		if (Platform::IsX11()) {
-			// Hide mediaview to make other apps visible.
-			Core::App().hideMediaView();
-		}
 		base::Platform::ShowInFolder(filepath);
 	});
 }

From 88e742927f886a7106f8bdd2c09ed4b7cc2cd083 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 3 Jun 2024 17:47:00 +0400
Subject: [PATCH 338/400] File descriptor fixes for XDPOpenWithDialog

- Open it with O_CLOEXEC
- Remove unneseccary std::array complication
- Rely on Gio::UnixFDList to close it
---
 .../SourceFiles/platform/linux/file_utilities_linux.cpp    | 7 +++----
 Telegram/lib_base                                          | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index d79e4778e87fd..f314fb0aff6fe 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -44,14 +44,12 @@ bool UnsafeShowOpenWith(const QString &filepath) {
 
 	const auto fd = open(
 		QFile::encodeName(filepath).constData(),
-		O_RDONLY);
+		O_RDONLY | O_CLOEXEC);
 
 	if (fd == -1) {
 		return false;
 	}
 
-	const auto fdGuard = gsl::finally([&] { close(fd); });
-
 	const auto handleToken = "tdesktop"
 		+ std::to_string(base::RandomValue<uint>());
 
@@ -73,6 +71,7 @@ bool UnsafeShowOpenWith(const QString &filepath) {
 			nullptr));
 
 	if (!request) {
+		close(fd);
 		return false;
 	}
 
@@ -107,7 +106,7 @@ bool UnsafeShowOpenWith(const QString &filepath) {
 				GLib::Variant::new_variant(
 					GLib::Variant::new_boolean(true))),
 		}),
-		Gio::UnixFDList::new_from_array((std::array{ fd }).data(), 1),
+		Gio::UnixFDList::new_from_array(&fd, 1),
 		nullptr);
 
 	if (!result) {
diff --git a/Telegram/lib_base b/Telegram/lib_base
index e2c62ef0b4581..4d56f8b4bba52 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit e2c62ef0b4581d84e4ff79623a7e5e9ed315bad7
+Subproject commit 4d56f8b4bba52b46844f46fafa5f9b6b2704429e

From 9043c1872511d3aaac221667ab669659c564a9e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jun 2024 22:26:59 +0400
Subject: [PATCH 339/400] Don't drop search on non-empty backspace.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 9965c2ac43644..7ff4207040202 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3425,7 +3425,8 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		//}
 	} else if ((e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Tab)
 		&& _searchHasFocus
-		&& !_searchState.inChat) {
+		&& !_searchState.inChat
+		&& _searchState.query.isEmpty()) {
 		escape();
 	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
 		submit();

From 06d0e78b0008b80a2b458552fc670d0c2892f4e0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jun 2024 22:59:14 +0400
Subject: [PATCH 340/400] Fix a crash in forwarded sender avatars.

---
 .../SourceFiles/history/history_item_components.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 69b514f537def..60c29e7ee465c 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -196,14 +196,19 @@ void HistoryMessageForwarded::create(
 			? originalSender->name()
 			: originalHiddenSenderInfo->name)
 	};
-	if (originalSender) {
-		context.session = &originalSender->owner().session();
+	if (const auto copy = originalSender) {
+		context.session = &copy->owner().session();
 		context.customEmojiRepaint = [=] {
-			originalSender->owner().requestItemRepaint(item);
+			// It is important to capture here originalSender by value,
+			// not capture the HistoryMessageForwarded* and read the
+			// originalSender field, because the components themselves
+			// get moved from place to place and the captured `this`
+			// pointer may become invalid, resulting in a crash.
+			copy->owner().requestItemRepaint(item);
 		};
 		phrase = Ui::Text::SingleCustomEmoji(
 			context.session->data().customEmojiManager().peerUserpicEmojiData(
-				originalSender,
+				copy,
 				st::fwdTextUserpicPadding));
 	}
 	if (!originalPostAuthor.isEmpty()) {

From 6400875d55d8a3a3a2fcc4e79d674efcedb4f539 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 3 Jun 2024 18:20:38 +0300
Subject: [PATCH 341/400] Replaced text drawing in menu from phone handler with
 Text::String.

---
 .../SourceFiles/core/phone_click_handler.cpp   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp
index fc8d50d01e23d..93b79d77d81c0 100644
--- a/Telegram/SourceFiles/core/phone_click_handler.cpp
+++ b/Telegram/SourceFiles/core/phone_click_handler.cpp
@@ -168,7 +168,16 @@ void ResolvePhoneAction::paint(Painter &p) {
 			width());
 	} else {
 		p.setPen(selected ? _st.itemFgShortcutOver : _st.itemFgShortcut);
-		p.drawText(rect() - padding, _below.toString(), style::al_center);
+		const auto w = width() - padding.left() - padding.right();
+		_below.draw(p, Ui::Text::PaintContext{
+			.position = QPoint(
+				(width() - w) / 2,
+				(height - _below.countHeight(w)) / 2),
+			.availableWidth = w,
+			.outerWidth = w,
+			.align = style::al_center,
+			.elisionLines = 2,
+		});
 	}
 }
 
@@ -208,8 +217,6 @@ void ResolvePhoneAction::prepare() {
 			_below.setMarkedText(_st.itemStyle, { text }, options);
 			return _below.maxWidth();
 		}();
-		_above.setMarkedText(_st.itemStyle, { above }, options);
-		_below.setMarkedText(_st.itemStyle, { below }, options);
 		const auto textLeft = padding.left()
 			+ st::groupCallJoinAsPhotoSize
 			+ padding.left();
@@ -217,6 +224,11 @@ void ResolvePhoneAction::prepare() {
 			(textLeft + tempWidth + padding.right()),
 			_st.widthMin,
 			_st.widthMax);
+		if (!no.isEmpty()) {
+			_below = Ui::Text::String(w);
+		}
+		_above.setMarkedText(_st.itemStyle, { above }, options);
+		_below.setMarkedText(_st.itemStyle, { below }, options);
 		setMinWidth(w);
 		_aboveWidth = w - textLeft - padding.right();
 		_belowWidth = w

From 4f4d21698746e2aa2c0706cbbd6164755b4056d9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 3 Jun 2024 19:35:34 +0300
Subject: [PATCH 342/400] Fixed display of button in channel earn section when
 balance is low.

---
 .../info/channel_statistics/earn/info_earn_inner_widget.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
index d3af5f14d3785..a151443e62dde 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_earn_inner_widget.cpp
@@ -628,7 +628,7 @@ void InnerWidget::fill() {
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
-	if (channel) {
+	if (channel && data.availableBalance) {
 		const auto value = data.availableBalance;
 		AddHeader(container, tr::lng_channel_earn_balance_title);
 		Ui::AddSkip(container);

From 379a94db428b7a9489efae77dc87f0290c570194 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jun 2024 23:05:23 +0400
Subject: [PATCH 343/400] Version 5.1.2.

- Several bugs fixed including a couple of crashes.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml              | 2 +-
 Telegram/Resources/winrc/Telegram.rc                      | 8 ++++----
 Telegram/Resources/winrc/Updater.rc                       | 8 ++++----
 Telegram/SourceFiles/core/phone_click_handler.cpp         | 2 +-
 Telegram/SourceFiles/core/version.h                       | 4 ++--
 .../SourceFiles/history/view/media/history_view_gif.cpp   | 1 -
 Telegram/build/version                                    | 8 ++++----
 changelog.txt                                             | 4 ++++
 8 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index da40284a8377b..8068a8279a978 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.1.1.0" />
+    Version="5.1.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 e02d029eb3a82..67714078f1157 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,1,1,0
- PRODUCTVERSION 5,1,1,0
+ FILEVERSION 5,1,2,0
+ PRODUCTVERSION 5,1,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.1.1.0"
+            VALUE "FileVersion", "5.1.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.1.0"
+            VALUE "ProductVersion", "5.1.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 8591989f3bd49..f5f25bfaa4f67 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,1,1,0
- PRODUCTVERSION 5,1,1,0
+ FILEVERSION 5,1,2,0
+ PRODUCTVERSION 5,1,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.1.1.0"
+            VALUE "FileVersion", "5.1.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.1.0"
+            VALUE "ProductVersion", "5.1.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp
index 93b79d77d81c0..19d15b78a7e57 100644
--- a/Telegram/SourceFiles/core/phone_click_handler.cpp
+++ b/Telegram/SourceFiles/core/phone_click_handler.cpp
@@ -173,8 +173,8 @@ void ResolvePhoneAction::paint(Painter &p) {
 			.position = QPoint(
 				(width() - w) / 2,
 				(height - _below.countHeight(w)) / 2),
-			.availableWidth = w,
 			.outerWidth = w,
+			.availableWidth = w,
 			.align = style::al_center,
 			.elisionLines = 2,
 		});
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 8ba762a1ea82b..1ef52dfed3e50 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 = 5001001;
-constexpr auto AppVersionStr = "5.1.1";
+constexpr auto AppVersion = 5001002;
+constexpr auto AppVersionStr = "5.1.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 62dde278dffb7..44644cffe2d6b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -388,7 +388,6 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 	const auto displayLoading = (item->isSending() || _data->displayLoading());
 	const auto st = context.st;
 	const auto sti = context.imageStyle();
-	const auto stm = context.messageStyle();
 	const auto cornerDownload = downloadInCorner();
 	const auto canBePlayed = _dataMedia->canBePlayed(_realParent);
 	const auto autoplay = autoplayEnabled()
diff --git a/Telegram/build/version b/Telegram/build/version
index 505809f37ae4a..326855a8091ce 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5001001
+AppVersion         5001002
 AppVersionStrMajor 5.1
-AppVersionStrSmall 5.1.1
-AppVersionStr      5.1.1
+AppVersionStrSmall 5.1.2
+AppVersionStr      5.1.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.1.1
+AppVersionOriginal 5.1.2
diff --git a/changelog.txt b/changelog.txt
index b07e06e101a6d..bb35264162ffa 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+5.1.2 (03.06.24)
+
+- Several bugs fixed including a couple of crashes.
+
 5.1.1 (01.06.24)
 
 - Fix caption display on some media.

From 93e592472c84e4801d1174702fe0c2833466af94 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Jun 2024 13:47:23 +0400
Subject: [PATCH 344/400] Version 5.1.3.

- Rebuild version for macOS to fix the phrases.
---
 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 8068a8279a978..41b08aafcee1f 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.1.2.0" />
+    Version="5.1.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 67714078f1157..bf726f1800210 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,1,2,0
- PRODUCTVERSION 5,1,2,0
+ FILEVERSION 5,1,3,0
+ PRODUCTVERSION 5,1,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.1.2.0"
+            VALUE "FileVersion", "5.1.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.2.0"
+            VALUE "ProductVersion", "5.1.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index f5f25bfaa4f67..26660717b3999 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,1,2,0
- PRODUCTVERSION 5,1,2,0
+ FILEVERSION 5,1,3,0
+ PRODUCTVERSION 5,1,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.1.2.0"
+            VALUE "FileVersion", "5.1.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.2.0"
+            VALUE "ProductVersion", "5.1.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 1ef52dfed3e50..a4a4b57e7db83 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 = 5001002;
-constexpr auto AppVersionStr = "5.1.2";
+constexpr auto AppVersion = 5001003;
+constexpr auto AppVersionStr = "5.1.3";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 326855a8091ce..79b3cd70cb539 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5001002
+AppVersion         5001003
 AppVersionStrMajor 5.1
-AppVersionStrSmall 5.1.2
-AppVersionStr      5.1.2
+AppVersionStrSmall 5.1.3
+AppVersionStr      5.1.3
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.1.2
+AppVersionOriginal 5.1.3
diff --git a/changelog.txt b/changelog.txt
index bb35264162ffa..b3b778e2c7f59 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+5.1.3 (04.06.24)
+
+- Rebuild version for macOS to fix the phrases.
+
 5.1.2 (03.06.24)
 
 - Several bugs fixed including a couple of crashes.

From 61c17c0a93bfc2d212dd7cbd732195ab5a8301ff Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 4 Jun 2024 15:06:43 +0400
Subject: [PATCH 345/400] libasound2 -> libasound2t64

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d9db537b31a65..a571c7197ec31 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -111,7 +111,7 @@ parts:
       - libxcb-screensaver0-dev
       - zlib1g-dev
     stage-packages:
-      - libasound2
+      - libasound2t64
       - libavif16
       - libboost-regex1.83.0
       - libglib2.0-0t64

From 5b453973839ca5ada588b60579e02739ad8244ed Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 5 Jun 2024 18:28:21 +0400
Subject: [PATCH 346/400] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 115530c7aa869..36f65327aaf61 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 115530c7aa8694f461d04f95d6a3561a18562e7e
+Subproject commit 36f65327aaf61cfb9c4fba8f3cb08a35cbcb6556

From 749b2e0e955b3df1f341d1050614677591d3e39b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 4 Jun 2024 17:41:24 +0300
Subject: [PATCH 347/400] Added ability to see vcard if available to all types
 if contacts media.

---
 Telegram/SourceFiles/history/history_item.cpp |  4 ++--
 .../view/media/history_view_contact.cpp       | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 5a434c3a644a7..73b92e21d51a0 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -249,8 +249,8 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 					} else if (type.startsWith("BDAY")) {
 						items[Type::Birthday] = value;
 					} else if (type.startsWith("N")) {
-						items[Type::Birthday] = value;
-						items[Type::Birthday].replace(';', ' ');
+						items[Type::Name] = value;
+						items[Type::Name].replace(';', ' ');
 					}
 				}
 			}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
index d0fbfe7302e93..dc8995903dd10 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
@@ -189,7 +189,15 @@ ClickHandlerPtr AddContactClickHandler(not_null<HistoryItem*> item) {
 				});
 			}
 		}
-		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+		{
+			const auto inner = box->verticalLayout();
+			if (inner->count() > 2) {
+				delete inner->widgetAt(inner->count() - 1);
+				delete inner->widgetAt(inner->count() - 1);
+			}
+		}
+
+		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
 	};
 }
 
@@ -259,6 +267,7 @@ QSize Contact::countOptimalSize() {
 			full);
 	}
 
+	const auto vcardBoxFactory = _vcardBoxFactory;
 	_buttons.clear();
 	if (_contact) {
 		const auto message = tr::lng_contact_send_message(tr::now).toUpper();
@@ -276,20 +285,20 @@ QSize Contact::countOptimalSize() {
 			});
 		}
 		_mainButton.link = _buttons.front().link;
-	} else if (const auto vcardBoxFactory = _vcardBoxFactory) {
+	} else if (vcardBoxFactory) {
 		const auto view = tr::lng_contact_details_button(tr::now).toUpper();
 		_buttons.push_back({
 			view,
 			st::semiboldFont->width(view),
 			AddContactClickHandler(_parent->data()),
 		});
+	}
+	if (vcardBoxFactory) {
 		_mainButton.link = std::make_shared<LambdaClickHandler>([=](
 				const ClickContext &context) {
 			const auto my = context.other.value<ClickHandlerContext>();
 			if (const auto controller = my.sessionWindow.get()) {
-				controller->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
-					vcardBoxFactory(box);
-				}));
+				controller->uiShow()->show(Box(vcardBoxFactory));
 			}
 		});
 	}

From 9e3e7265d2eb789aef385c39a8e283f2f6f2aad4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 4 Jun 2024 18:04:06 +0300
Subject: [PATCH 348/400] Improved display of cached message preview in profile
 sections.

---
 .../SourceFiles/info/profile/info_profile_actions.cpp  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 3d6fb7675b339..f7e37ced57545 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1364,7 +1364,11 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 			auto &lifetime = preview->lifetime();
 			using namespace Dialogs::Ui;
 			const auto previewView = lifetime.make_state<MessageView>();
+			const auto previewUpdate = [=] { preview->update(); };
 			preview->resize(0, st::infoLabeled.style.font->height);
+			if (!previewView->dependsOn(item)) {
+				previewView->prepare(item, nullptr, previewUpdate, {});
+			}
 			preview->paintRequest(
 			) | rpl::start_with_next([=, fullId = item->fullId()](
 					const QRect &rect) {
@@ -1393,11 +1397,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 						preview->rect(),
 						tr::lng_contacts_loading(tr::now),
 						style::al_left);
-					previewView->prepare(
-						item,
-						nullptr,
-						[=] { preview->update(); },
-						{});
+					previewView->prepare(item, nullptr, previewUpdate, {});
 					preview->update();
 				}
 			}, preview->lifetime());

From 5db2821f8c051c57d16ecda83023f37c0642903c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 4 Jun 2024 18:09:25 +0300
Subject: [PATCH 349/400] Removed unused refund api support for credits.

---
 Telegram/SourceFiles/api/api_credits.cpp      | 20 --------------
 Telegram/SourceFiles/api/api_credits.h        |  6 -----
 .../info_statistics_list_controllers.cpp      | 27 -------------------
 3 files changed, 53 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 00f9e789f8a49..44d274e5862d4 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -199,24 +199,4 @@ rpl::producer<not_null<PeerData*>> PremiumPeerBot(
 	};
 }
 
-void CreditsRefund(
-		not_null<PeerData*> peer,
-		const QString &entryId,
-		Fn<void()> done,
-		Fn<void(QString)> fail) {
-	const auto user = peer->asUser();
-	if (!user) {
-		return;
-	}
-	peer->session().api().request(MTPpayments_RefundStarsCharge(
-		user->inputUser,
-		MTP_string(entryId)
-	)).done([=](const MTPUpdates &result) {
-		peer->session().api().updates().applyUpdates(result);
-		done();
-	}).fail([=](const MTP::Error &error) {
-		fail(error.type());
-	}).send();
-}
-
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_credits.h b/Telegram/SourceFiles/api/api_credits.h
index bd064a65b9b3c..265e7b3871076 100644
--- a/Telegram/SourceFiles/api/api_credits.h
+++ b/Telegram/SourceFiles/api/api_credits.h
@@ -68,12 +68,6 @@ class CreditsHistory final {
 
 };
 
-void CreditsRefund(
-	not_null<PeerData*> peer,
-	const QString &entryId,
-	Fn<void()> done,
-	Fn<void(QString)> fail);
-
 [[nodiscard]] rpl::producer<not_null<PeerData*>> PremiumPeerBot(
 	not_null<Main::Session*> session);
 
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 2dd25c5715067..f319f873b9339 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -861,10 +861,6 @@ class CreditsController final : public PeerListController {
 	void rowClicked(not_null<PeerListRow*> row) override;
 	void loadMoreRows() override;
 
-	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
-		QWidget *parent,
-		not_null<PeerListRow*> row) override;
-
 	[[nodiscard]] bool skipRequest() const;
 	void requestNext();
 
@@ -957,29 +953,6 @@ void CreditsController::rowClicked(not_null<PeerListRow*> row) {
 	}
 }
 
-base::unique_qptr<Ui::PopupMenu> CreditsController::rowContextMenu(
-		QWidget *parent,
-		not_null<PeerListRow*> row) {
-	const auto entry = static_cast<const CreditsRow*>(row.get())->entry();
-	if (!entry.bareId) {
-		return nullptr;
-	}
-	auto menu = base::make_unique_q<Ui::PopupMenu>(
-		parent,
-		st::defaultPopupMenu);
-	const auto peer = row->peer();
-	const auto callback = crl::guard(parent, [=, id = entry.id] {
-		const auto show = delegate()->peerListUiShow();
-		Api::CreditsRefund(
-			peer,
-			id,
-			[=] { show->showToast(tr::lng_report_spam_done(tr::now)); },
-			[=](const QString &error) { show->showToast(error); });
-	});
-	menu->addAction(tr::lng_channel_earn_history_return(tr::now), callback);
-	return menu;
-}
-
 rpl::producer<bool> CreditsController::allLoadedValue() const {
 	return _allLoaded.value();
 }

From fe6f65b3ab94b72ae3b82b6831ecd549624e811a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 4 Jun 2024 18:18:43 +0300
Subject: [PATCH 350/400] Fixed text elision of peer name in section of chat
 preview.

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

diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 622ba8357cda7..732697926a32e 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1111,6 +1111,7 @@ previewMarkRead: FlatButton(historyComposeButton) {
 previewName: FlatLabel(defaultFlatLabel) {
 	style: semiboldTextStyle;
 	textFg: windowFg;
+	maxHeight: 30px;
 }
 previewStatus: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;

From 72c667b1530aecd717b219a1e42744e67abdbb6d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Jun 2024 10:42:20 +0400
Subject: [PATCH 351/400] Redesign search scope selection.

---
 Telegram/Resources/icons/menu/chats.png       | Bin 0 -> 766 bytes
 Telegram/Resources/icons/menu/chats@2x.png    | Bin 0 -> 1672 bytes
 Telegram/Resources/icons/menu/chats@3x.png    | Bin 0 -> 2485 bytes
 Telegram/SourceFiles/dialogs/dialogs.style    |  32 +-
 .../dialogs/dialogs_inner_widget.cpp          | 383 ++++++++-------
 .../dialogs/dialogs_inner_widget.h            |  81 ++--
 Telegram/SourceFiles/dialogs/dialogs_key.cpp  |   2 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 153 ++----
 Telegram/SourceFiles/dialogs/dialogs_widget.h |   4 +-
 .../dialogs/ui/chat_search_empty.cpp          |   6 -
 .../dialogs/ui/chat_search_empty.h            |   4 -
 .../SourceFiles/dialogs/ui/chat_search_in.cpp | 459 ++++++++++++++++++
 .../SourceFiles/dialogs/ui/chat_search_in.h   | 100 ++++
 .../dialogs/ui/chat_search_tabs.cpp           | 201 --------
 .../SourceFiles/dialogs/ui/chat_search_tabs.h |  89 ----
 .../history/view/media/history_view_gif.cpp   |   4 +
 .../history/view/media/history_view_gif.h     |   4 +-
 .../SourceFiles/ui/dynamic_thumbnails.cpp     | 176 ++++++-
 Telegram/SourceFiles/ui/dynamic_thumbnails.h  |   6 +
 Telegram/SourceFiles/ui/menu_icons.style      |   1 +
 Telegram/cmake/td_ui.cmake                    |   4 +-
 Telegram/lib_ui                               |   2 +-
 22 files changed, 1070 insertions(+), 641 deletions(-)
 create mode 100644 Telegram/Resources/icons/menu/chats.png
 create mode 100644 Telegram/Resources/icons/menu/chats@2x.png
 create mode 100644 Telegram/Resources/icons/menu/chats@3x.png
 create mode 100644 Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp
 create mode 100644 Telegram/SourceFiles/dialogs/ui/chat_search_in.h
 delete mode 100644 Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
 delete mode 100644 Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h

diff --git a/Telegram/Resources/icons/menu/chats.png b/Telegram/Resources/icons/menu/chats.png
new file mode 100644
index 0000000000000000000000000000000000000000..e97616ee0c8f81e1705bd66a1109e8757a10ffcc
GIT binary patch
literal 766
zcmV<a0s;MrP)<h;3K|Lk000e1NJLTq000;O000;W0ssI2ZxyPq00009a7bBm000XU
z000XU0RWnu7ytkQut`KgR5*>jlubw~Q546oqmT|HhL943GZPvOqTnVGH$os7)FPEO
zwn%6p<tAGM(LxP(g5q+P?jooZ+_<wAt)db?u#M6#oFp7cy3T!zu~PGk_u&0k_nve9
zzjH2k?f~!~gyXnEq4-O)NF;JPofj7uEXyK<5JDdxA2&BQM@L6;xqMoRUax<6c;GlL
z9*;X5j+K=ailVGm>+$jN^Yb&yvL26TGR0=IaU7RUrwM}ios~+Zp-`yZZl9f<jiW3r
zEj1dAlarJ2&CF&q$8lb-cVxx&_4VcD<>ave*xlV_Syri34#^P&!Snp`^71qwkw{c1
z6#RbwKpX=AI2?}0$H#KHJj#q=*!LPCbbfxmzP=6s&}cNXv$H=Sf*?wz(wHfDp6}h3
zN+sb!g27-k8vOx@#o~d|@j?g*GcpY0@p#l~br)2vR&_ev^dOy1SFKh70J&VQR;#V8
zt#v_}OvYp~kt8`KXlrXLlgS9{VzH>zYP+CHrIO8NCwysN+TPwKNivyC3fuSh_r9k?
z({!`hJUBQQY8H#d!opxMG#ZWGyT84?Jv=<@t3EwF&FAx@29Zc4fk2?yY$g(k@1RPh
zf)E;w#=g?4tE*Tn1^~b?%;j>~?RJWyluD&uulM<U!eidw-|w{~5{bLJyFSXo!ouh0
z=f=jy&d$#L{r%h9+w1Eq`qI<WQ#c%+pP%owIGxURyKOd``#^hpdxGcX<s}>r3;#2P
zLZQ)Uq*Ce7!xoFhNF*{C#c|wbvn?(z_6BL1W*BC3b8~KP4gfGSGegt#>guYHjmP7u
zRBC9CL8;YhhGFXUIzp(`YIQmtp64Ni>2%udc6+^E2;o5Qags<RBuQGWR)fKS<2Xf8
w48zoFH3%Vu&|<Mn3mPR1!(=kqzfykd50r=;n6IL=2><{907*qoM6N<$f;6OP@&Et;

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/chats@2x.png b/Telegram/Resources/icons/menu/chats@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6682dbcf6f153a678d81e9a6523efa0aec7efb37
GIT binary patch
literal 1672
zcmV;326y?1P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00009a7bBm000XU
z000XU0RWnu7ytkUI!Q!9R9J=Wm|sYfUl_+9x3#@vTTWrvnp?5d1S?}O5usJuAIiG0
z%vJ{dv76REShn3{h$2By2|*zJ*-b$Nljx?h63tnbhE(RX5^7dke>P!rY;$hU@8Xd$
z=3KgF@Pocr@6LIi@A;hPocDdtJAi-spNXAZ8pAL$nM^L11Ax!xL&TI)%|a{|tEi}`
zzP`Svr)O+z45KtTIr;6|H?!GXQ&Y2e@#1+$;qiD!j~*Qz9mUzHt*x!3q$KI#(h_$c
zIB=k`u`xS4n|^w|-uCwP?(S~8-R^KW#>dAc63L=Pi<C;`rcIj)3k%cIrVQKK+D@K4
zIW#nsG+C?!0>RCjHzV`z=;+w8WebnTOOPU!O7(iZ-EOB8kH@oT&z{uKC=`l!@7|Gb
ze}DhlwQFae%jfg;dcD`{rS#_J=0By$$jBHR93;DzmKKI#k}z4ZVujUeC6lJ6rsQcD
zhUx0+BBNu+jwNpdAQTFpK7C47M~)mx(xs`Xi7Xl#8vcZaBo>PY1_lsuVqzjcKYz~o
zN~O~8_akC!YwMrWkQ54q$Kyf72M-?1Ik~m96%oB&uR@_n6%YUz3<j$Dwr$(ykd~E|
z6$*tAvA(`Og){)b<#IoM{D_G6?%kV1nog%f#Bewqc?_mdb#--!==b~6)6-|0)85{W
zh!%?_<um}WeED)(wSD{cC5~i8u2!vD1pp5pKAaDr;o;#=pFRP=%9Sgrh0EohK7CrP
zR>x0Z7=~uBfB*jZ00Mx{&Q3(Ub?X-Wtgfy`M7P^5kw~J$rYa<p$>?HqbabA8zI^!t
z0Fe#a*Vh*cg+wCJ*|TTk0C6}Rx(J0r^8`fBZ1&WVaCmt5#*G^QP*YPAz0;?FzJC2m
z7xQ<*qS{cMNEa_&1OPstzkB!YSfKIoaktwI0CXyy50P^;(9qCOZ*MOEY~8vw76<?a
z1_l6N!-fs>M6+z!GJ=S1@95|Nfa2ofI61YowTKuD1~W4=Qx0_M)G0cB$J|p|t(NZY
zjEs!f9Hml8eR{qAPsWaH+lW{!*6Y`=5%KZk$1z>&*RQ8Rb8>Rxcs+Xb2oYT_S89uN
z`0!yGwYs`GrmLi+gt`g}3gToI78cU`wWXycRWzBInLmE~K*Sd>UPL|tBHFogCjre^
zf~!}rQiM*Yi|OKWxrq<?B9SPjg<%+aK!?NOqN1YdDJM>xKt!L<H>2sog$v)jc|#j;
z`}XY#hX1YDY_{2Krs*{{HpY#)efu^d(hWYN<Z}7XpFa`t`Sa&V(@3RKstqEVOs2Ro
zJRZ;Ob|d1sbLSFyu~;mp(}{@Z&!0~MB`qzjva<5~_wPhwHk%{wr5NqnwTohAeCLzY
zYBj}e+_-U0C|oYLva*uya9VVu(Kvl0lNKyk@c#XKM6_D1(d}{AwOTCz_<X*uuC7R<
zKp?2At1Bxj>+bIE>FF668F9H>e!oBZQ@X6IOehpm{NUiAPN(ba?3{`I`0?Ypxw!yf
zFc=celF#S6T(0Pa=WsZC_wJqjpAA;4RjbvqSgZu2tXZ>$K5w2pd6I|*01h5JNWK*n
z6`MD2zHs4!!{LYwX0cdoHrsTFa5&u8*VoX{P+VM`7zF_G^73epI-O1`QX)Nj_AKta
z-@biYT3SjmSy@@DSFbKDEiErESF6=>xtz=8{>C>-7K;TD1A%}>qxpSwWJ{9VZnw!~
z(r7d@?ad@)GMNx@WMpJk(JGbd(xpph&YY>JsL095Nl<^0NVH?ej-^YN&K0Pts)}Z-
zQmN*en@HEMUnk#}FJIQy)~Zx0i9`}zNV!~IRaMp8++1E>9-Sx<2<YSb^5x5^1Uhu+
zP%s#b*=m76;PdCt4u@l6Vj{Zz?%lg|KqFndb`257#>NB!L5yvZ|H1-5e}Dg#D_1^z
z_`opCk|j%MaoKEkdV0E0D2$wn0)YUB!^zLj*XeZY)~zcjD9Fpp0|1Ri!!V4^W_$JO
zRkUqtwyIbx&dtr0$z<8t*;1+0@Atc0F1y{{+uQr=*Ds^dXfPP~eE#&rJ9q9xpYZ>l
zq*AHTXuN;_zRhNvoSdX}3<iVKX;OAG&t7acTPzlfL?VyJ<8(UzKEOYvR{sIlvf~E8
S=kZhk0000<MNUMnLSTY<xJb4D

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/chats@3x.png b/Telegram/Resources/icons/menu/chats@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ac3ab7d0a286bf7b4f9b8ffa358697a0ae77239
GIT binary patch
literal 2485
zcmV;m2}<^fP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00009a7bBm000XU
z000XU0RWnu7ytkXXGugsRA_<inrTc^O&7-tZJ`uep{2Bl;RyzjML}Hf10Td7Mi2=Y
z#VEKCC1}JzL>7rga7hqEFaicd;u4I;SV<HFt%6Zx2?RwbOId^h77Db`N=q%}`EZ}i
zd%M!x-eTT_->0F>Ip=@w%$=D#GZ@SYE3B}B0hpod4vWP)J3HIk+uPXK5C{Z`L?RZ8
z`FuW?%T*{8=*BWRWHNdG{{5w;r9C}8GMQ{q6H=+Pv$M0Ps3<fvlt?80ZOJ;Zv$IP|
zN~*1`)s~Dlq*7^3O-+1!yp4^`-%dgqTU*=A%*>gY8ASQ0!{_r;Q&X+2txX{k**iue
zk&=><5)%_wty-o2UpAZF+1WWhKF;Iucs!m!AfQsI3<iTvr!yD~A0HoAS66kb$;ru_
zoSeIN?@A;R1Cub4O`A6L_4TPdb+K4nQBe^W7w7Ekyrc(LSJ!jr&Q(=aNhA^#Kke=9
zZf<VNkcBEIPo7j!BNPfVGBRv!Z4K~7qtUXnv&CXD+~Mr(?7@Qv(H5>90)g=G;X}BB
znVFd@SFRYA5*!+hcJt=Vxw$#G^ZfjL91e$uaGjW&n=_eAc;J?nmbGiwq8P%<%d4xa
z3m&4hv=l}EnkgtKfQKw9Dzdb+L_LbNwRL%UIXqBiW+v)U{zqC`8i=G&C{CO>VZvY-
z%=z=@;km`e#+oEdL_`EUOk!f9Nx~>|{rYtfQ7)GU1O%WQfJh_`4-bPF+1c4B2hh%g
z2M<8p&dyGh2a;>ot^w~%CezFe<+ZX7a5!9TZ7qnNkdT0yYZn(6FlC8EA}1#&)LiR_
zySqDBe+mQw8jXgI-xn`lfCrYAmWGZ~gyiJp01fx<-9y2nlarHNE{8n!_V!v>SfJn(
zIV2KkY-|jY@%#60GMS9jgSpDzF)=Y%EEX!~<>kp_G8AMYM<fz~h9VM)M~)mZ)?;gH
zD;RAZ92|^wX9R9;ZlE{5d-u*LUk(lq3WWml#bU8gQfN5ezI}tlNF)*~D=S2{N?p<4
z-ye+Z&!0a>O`xFw4Fm#V>(;G^Y?Tu8^6~=ZmX;Rdl^F?K16&&hgE@Ql?Dy~AZ{NOc
zZmv2^XyD0{C!kxSHhUO>hldBylb@dtes^+m0<X;J)2B7sDy2)MQlY~9{5+q}H<@64
z85tP?WuOg%!N_E?g@pyEoRN{CaZ^YsF)&?>j*g-)6FDN0Xm)lMDw9Yg@H?N+2j6UT
zI{m_h3rjd^XlQ`ix4XOBG*S^WIXMYQdj0w}{C7H?E)t2LfARTzJRYxNsMKQM@vL6G
z+N5&zgg_vG9tgBSjE|2O6cj*ZdwcuP&`=dyrNo3nAygodNbsirTdY~L29$v|Kv`KC
zD64-2D<#(3+Y8Fezo=ISo)}yk1c$?^udj#7K|w((Uv5f?b#--t^5)H(QI?6E4I4Iq
zGMmj-uTWW82^FlYtbBZYv^rui7z+yv&>Q*k<x8}6BBrjc4lG>l?CjJl?A*B%Omy+_
z@w$9{{`?tyEd1SL5l2Ty@RYxP{i?B!jg1YMsf&t=;Qvxxk1&}`s6ZqV_w3nY3dMSI
z;J^W}Tv8e90b;QjjF#{jTm%37^ABj;=H_NZyB&x&UUctI;&3=Nn+^J*j_GG$U;wK2
z{{8zULVo!00pxb{=u!Q(qDW$5BG91wZEtUHhpII;HZI}R*Vh+x?vas^<$u%Ybh=O|
zgapjb&+9&g86O{qYJU9qacS3OWo6)j<>lp}CRsloKYk3N>)z7D<MCkdsHmt|+O?yj
zBm9gfE-nr&(Myt?oDAar`t?iq0th}L+_`f{uK)=N3BX1!moLu<866!BT3~T;F*-V0
zcm2S?Kv4P2nKSx^DK0JsX0x-ietv$&3fD<+a4`IwJ~uaaNt68id{E!l*H_<2I2^9J
zx*Ax%ef!oZ;o31XGfPcP1^bzci;K^mJ=15V0S63&gM-LIdV70=U|CsN1`5{+g+h7r
z=FK9E+S*!uHfpzR+lHull{j_k6fh1C4>wG@Hn3Q1R8-W^&=5Q;7K^3vN`gA~@81Vj
z{{H^RVuNQXm&=z}vmgPB#YRU*_w@9@Q&K1tSFc{xYu5>b@%HuxlkM>EFtYO?GMOxu
zN+ILAx;kyu{QUe}TwL^Vh{NG_?AVc&mBrz37L}QtoJ2J6vREu&8xs?wA(jr~!-o%p
z72T^>uhc8hXtZ0mZXG*z41>Y&c)Z5O#>U3Rfq{Xksj2DdX|Y%gU0{Lku=x1+?Ao<U
z{dhs4P&|G5G(A0?%jN2sRd{%KU|=9rZfk3M^yrbEhX2vj)C4^enM|g#kB`IQ;^X6|
zrluB+U}0gQyu5t<`t^uZd3t&Z1Ong$@p0~!En9#wyt$m6oiAOw)ZgE4OiE*8V<jae
z?(Xi$G+{7wI(=|(5co0VYZ$&O92XZC5)zV<lEPxK;41@&iHV8A!ovFcdhkMOL@t+q
z`SK+_J>A#W*RZo+B9YkK+zcGD*=!w`Xfy|KbaWgV8dBe^Q$a457Z(>_zI<6A5MVGE
z3kwSm4-XoRMxjusR4R!?l1in}Ma;gwzJY;(`T2PR@&S~WmxF_{iHV8r+qeJx`4gFo
zsHiC2eQA1ny0EYi>FZ%6B_$<5!0z3<4RH|=5TG%iKY#vIS63f8bjTF<bC%@z@#8=V
zG!*MVYhO=JPL7F*Q79B#F1NqGzpt;arKP2{wN?LHg%k<}8om%{*9n8c7#$sjX7I|&
zO7-2}<pAn7JRUDAD@)`3OT+l|=@aNXbUGa^xB5b*QdRo!j~_pBb92MO!dzWl)fY`>
zW@gUL&XJLkd3kwFO-=p%{n}O`v9YnhXG%(n=~Gb#i^ZznMFmKu(&6FZj*gDz=H~A1
z?um&B_y-Gs$z-ap)JP-}__XJ6ILmou=sy??Ms{{K*l95gsZ^SiljG^>3HJ=YY!w_F
ztWAJvGsffbVPRqW_U#J_3exjvN+1xZ?`8{y!j6s(E|)txI?7-$z?MN(Rn^|Tdo}u5
zzNYl>@YuL<qo=3mx^?R)6bgw%A`*!rkqBBb^ZER?wzh_b1}>Ky5fPD_o2$<kgG?r~
zwzihb<;$QS9V{&^FJ8R3WKZVv`G4UxGafu19}*IB<Hn7eni>v=qjHUWZf-6zGE$rE
z|5>_rc6MYknM@{ISy^#79B7TY!U`*_fFAz>2()?c;ssb|00000NkvXXu0mjfBFUi>

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 4a910953ea228..dee018efde230 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 using "ui/basic.style";
 
+using "ui/layers/layers.style"; // boxRoundShadow
 using "ui/widgets/widgets.style";
 
 DialogRow {
@@ -446,10 +447,25 @@ dialogsLoadMoreLoading: InfiniteRadialAnimation(defaultInfiniteRadialAnimation)
 	size: size(12px, 12px);
 }
 
-dialogsSearchInHeight: 52px;
-dialogsSearchInPhotoSize: 36px;
-dialogsSearchInPhotoPadding: 10px;
-dialogsSearchInSkip: 7px;
+dialogsSearchInHeight: 38px;
+dialogsSearchInPhotoSize: 26px;
+dialogsSearchInPhotoPadding: 12px;
+dialogsSearchInSkip: 10px;
+dialogsSearchInNameTop: 9px;
+dialogsSearchInDownTop: 15px;
+dialogsSearchInDown: icon {{ "intro_country_dropdown", windowBoldFg }};
+dialogsSearchInDownSkip: 4px;
+dialogsSearchInMenu: PopupMenu(defaultPopupMenu) {
+	shadow: boxRoundShadow;
+	animation: PanelAnimation(defaultPanelAnimation) {
+		shadow: boxRoundShadow;
+	}
+	scrollPadding: margins(0px, 0px, 0px, 0px);
+	radius: 8px;
+	menu: menuWithIcons;
+}
+dialogsSearchInCheck: icon {{ "player/player_check", mediaPlayerActiveFg }};
+dialogsSearchInCheckSkip: 8px;
 dialogsSearchFromStyle: defaultTextStyle;
 dialogsSearchFromPalette: TextPalette(defaultTextPalette) {
 	linkFg: dialogsNameFg;
@@ -694,17 +710,17 @@ dialogsStoriesTooltipHide: IconButton(defaultIconButton) {
 	ripple: emptyRippleAnimation;
 }
 
-searchedBarHeight: 32px;
+searchedBarHeight: 28px;
 searchedBarFont: normalFont;
-searchedBarPosition: point(17px, 7px);
+searchedBarPosition: point(14px, 5px);
 searchedBarLabel: FlatLabel(defaultFlatLabel) {
 	textFg: searchedBarFg;
-	margin: margins(17px, 7px, 17px, 7px);
+	margin: margins(14px, 5px, 14px, 5px);
 }
 searchedBarLink: LinkButton(defaultLinkButton) {
 	color: searchedBarFg;
 	overColor: searchedBarFg;
-	padding: margins(17px, 7px, 17px, 7px);
+	padding: margins(14px, 5px, 14px, 5px);
 }
 
 dialogsSearchTagSkip: point(8px, 4px);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 3216e512cdef8..2614a334117e6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -9,7 +9,7 @@ For license and copyright information please follow this link:
 
 #include "dialogs/dialogs_three_state_icon.h"
 #include "dialogs/ui/chat_search_empty.h"
-#include "dialogs/ui/chat_search_tabs.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"
@@ -29,6 +29,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/scroll_area.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/text_options.h"
+#include "ui/dynamic_thumbnails.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "data/data_drafts.h"
@@ -137,9 +138,7 @@ constexpr auto kStartReorderThreshold = 30;
 		if (hashtag) {
 			text.append(tr::lng_search_tab_by_hashtag(tr::now));
 		} else {
-			text.append(
-				tr::lng_dlg_search_for_messages(tr::now)
-			).append('\n').append(Ui::Text::Link(tr::lng_cancel(tr::now)));
+			text.append(tr::lng_dlg_search_for_messages(tr::now));
 		}
 	} else {
 		text.append(tr::lng_search_tab_no_results(
@@ -214,12 +213,9 @@ InnerWidget::InnerWidget(
 , _narrowWidth(st::defaultDialogRow.padding.left()
 	+ st::defaultDialogRow.photoSize
 	+ st::defaultDialogRow.padding.left())
-, _cancelSearchFromUser(this, st::dialogsCancelSearchInPeer)
 , _childListShown(std::move(childListShown)) {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 
-	_cancelSearchFromUser->hide();
-
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
 		_topicJumpCache = nullptr;
@@ -553,11 +549,7 @@ int InnerWidget::searchTagsOffset() const {
 }
 
 int InnerWidget::searchInChatOffset() const {
-	auto result = searchTagsOffset();
-	if (_searchTags) {
-		result += _searchTags->height();
-	}
-	return result;
+	return searchTagsOffset() + (_searchTags ? _searchTags->height() : 0);
 }
 
 int InnerWidget::searchedOffset() const {
@@ -567,11 +559,7 @@ int InnerWidget::searchedOffset() const {
 }
 
 int InnerWidget::searchInChatSkip() const {
-	auto result = 0;
-	if (_searchFromShown) {
-		result += st::dialogsSearchInHeight;
-	}
-	return result;
+	return _searchIn ? _searchIn->height() : 0;
 }
 
 void InnerWidget::changeOpenedFolder(Data::Folder *folder) {
@@ -928,14 +916,14 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			p.translate(0, _searchTags->height());
 			top += _searchTags->height();
 		}
-		if (_searchFromShown) {
-			paintSearchInChat(p, {
-				.st = &st::forumTopicRow,
-				.currentBg = currentBg(),
-				.now = ms,
-				.width = fullWidth,
-				.paused = videoPaused,
-			});
+		if (_searchIn) {
+			//paintSearchInChat(p, {
+			//	.st = &st::forumTopicRow,
+			//	.currentBg = currentBg(),
+			//	.now = ms,
+			//	.width = fullWidth,
+			//	.paused = videoPaused,
+			//});
 			p.translate(0, searchInChatSkip());
 			top += searchInChatSkip();
 			if (_searchResults.empty()) {
@@ -1211,111 +1199,112 @@ void InnerWidget::paintSearchTags(
 	const auto position = QPoint(_searchTagsLeft, top);
 	_searchTags->paint(p, position, context.now, context.paused);
 }
-
-void InnerWidget::paintSearchInChat(
-		Painter &p,
-		const Ui::PaintContext &context) const {
-	auto height = searchInChatSkip();
-
-	auto top = 0;
-	p.setFont(st::searchedBarFont);
-	auto fullRect = QRect(0, top, width(), height - top);
-	p.fillRect(fullRect, currentBg());
-	if (_searchFromShown) {
-		p.setPen(st::dialogsTextFg);
-		p.setTextPalette(st::dialogsSearchFromPalette);
-		paintSearchInPeer(p, _searchFromShown, _searchFromUserUserpic, top, _searchFromUserText);
-		p.restoreTextPalette();
-	}
-}
-template <typename PaintUserpic>
-void InnerWidget::paintSearchInFilter(
-		Painter &p,
-		PaintUserpic paintUserpic,
-		int top,
-		const style::icon *icon,
-		const Ui::Text::String &text) const {
-	const auto savedPen = p.pen();
-	const auto userpicLeft = st::defaultDialogRow.padding.left();
-	const auto userpicTop = top
-		+ (st::dialogsSearchInHeight - st::dialogsSearchInPhotoSize) / 2;
-	paintUserpic(p, userpicLeft, userpicTop, st::dialogsSearchInPhotoSize);
-
-	const auto nameleft = st::defaultDialogRow.padding.left()
-		+ st::dialogsSearchInPhotoSize
-		+ st::dialogsSearchInPhotoPadding;
-	const auto namewidth = width()
-		- nameleft
-		- st::defaultDialogRow.padding.left()
-		- st::defaultDialogRow.padding.right()
-		- st::dialogsCancelSearch.width;
-	auto rectForName = QRect(
-		nameleft,
-		top + (st::dialogsSearchInHeight - st::semiboldFont->height) / 2,
-		namewidth,
-		st::semiboldFont->height);
-	if (icon) {
-		icon->paint(p, rectForName.topLeft(), width());
-		rectForName.setLeft(rectForName.left()
-			+ icon->width()
-			+ st::dialogsChatTypeSkip);
-	}
-	p.setPen(savedPen);
-	text.drawLeftElided(
-		p,
-		rectForName.left(),
-		rectForName.top(),
-		rectForName.width(),
-		width());
-}
-
-void InnerWidget::paintSearchInPeer(
-		Painter &p,
-		not_null<PeerData*> peer,
-		Ui::PeerUserpicView &userpic,
-		int top,
-		const Ui::Text::String &text) const {
-	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
-		peer->paintUserpicLeft(p, userpic, x, y, width(), size);
-	};
-	const auto icon = Ui::ChatTypeIcon(peer);
-	paintSearchInFilter(p, paintUserpic, top, icon, text);
-}
-
-void InnerWidget::paintSearchInSaved(
-		Painter &p,
-		int top,
-		const Ui::Text::String &text) const {
-	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
-		Ui::EmptyUserpic::PaintSavedMessages(p, x, y, width(), size);
-	};
-	paintSearchInFilter(p, paintUserpic, top, nullptr, text);
-}
-
-void InnerWidget::paintSearchInReplies(
-		Painter &p,
-		int top,
-		const Ui::Text::String &text) const {
-	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
-		Ui::EmptyUserpic::PaintRepliesMessages(p, x, y, width(), size);
-	};
-	paintSearchInFilter(p, paintUserpic, top, nullptr, text);
-}
-
-void InnerWidget::paintSearchInTopic(
-		Painter &p,
-		const Ui::PaintContext &context,
-		not_null<Data::ForumTopic*> topic,
-		Ui::PeerUserpicView &userpic,
-		int top,
-		const Ui::Text::String &text) const {
-	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
-		p.translate(x, y);
-		topic->paintUserpic(p, userpic, context);
-		p.translate(-x, -y);
-	};
-	paintSearchInFilter(p, paintUserpic, top, nullptr, text);
-}
+//
+//void InnerWidget::paintSearchInChat(
+//		Painter &p,
+//		const Ui::PaintContext &context) const {
+//	auto height = searchInChatSkip();
+//
+//	auto top = 0;
+//	p.setFont(st::searchedBarFont);
+//	auto fullRect = QRect(0, top, width(), height - top);
+//	p.fillRect(fullRect, currentBg());
+//	if (_searchFromShown) {
+//		p.setPen(st::dialogsTextFg);
+//		p.setTextPalette(st::dialogsSearchFromPalette);
+//		paintSearchInPeer(p, _searchFromShown, _searchFromUserUserpic, top, _searchFromUserText);
+//		p.restoreTextPalette();
+//	}
+//}
+//
+//template <typename PaintUserpic>
+//void InnerWidget::paintSearchInFilter(
+//		Painter &p,
+//		PaintUserpic paintUserpic,
+//		int top,
+//		const style::icon *icon,
+//		const Ui::Text::String &text) const {
+//	const auto savedPen = p.pen();
+//	const auto userpicLeft = st::defaultDialogRow.padding.left();
+//	const auto userpicTop = top
+//		+ (st::dialogsSearchInHeight - st::dialogsSearchInPhotoSize) / 2;
+//	paintUserpic(p, userpicLeft, userpicTop, st::dialogsSearchInPhotoSize);
+//
+//	const auto nameleft = st::defaultDialogRow.padding.left()
+//		+ st::dialogsSearchInPhotoSize
+//		+ st::dialogsSearchInPhotoPadding;
+//	const auto namewidth = width()
+//		- nameleft
+//		- st::defaultDialogRow.padding.left()
+//		- st::defaultDialogRow.padding.right()
+//		- st::dialogsCancelSearch.width;
+//	auto rectForName = QRect(
+//		nameleft,
+//		top + (st::dialogsSearchInHeight - st::semiboldFont->height) / 2,
+//		namewidth,
+//		st::semiboldFont->height);
+//	if (icon) {
+//		icon->paint(p, rectForName.topLeft(), width());
+//		rectForName.setLeft(rectForName.left()
+//			+ icon->width()
+//			+ st::dialogsChatTypeSkip);
+//	}
+//	p.setPen(savedPen);
+//	text.drawLeftElided(
+//		p,
+//		rectForName.left(),
+//		rectForName.top(),
+//		rectForName.width(),
+//		width());
+//}
+//
+//void InnerWidget::paintSearchInPeer(
+//		Painter &p,
+//		not_null<PeerData*> peer,
+//		Ui::PeerUserpicView &userpic,
+//		int top,
+//		const Ui::Text::String &text) const {
+//	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
+//		peer->paintUserpicLeft(p, userpic, x, y, width(), size);
+//	};
+//	const auto icon = Ui::ChatTypeIcon(peer);
+//	paintSearchInFilter(p, paintUserpic, top, icon, text);
+//}
+//
+//void InnerWidget::paintSearchInSaved(
+//		Painter &p,
+//		int top,
+//		const Ui::Text::String &text) const {
+//	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
+//		Ui::EmptyUserpic::PaintSavedMessages(p, x, y, width(), size);
+//	};
+//	paintSearchInFilter(p, paintUserpic, top, nullptr, text);
+//}
+//
+//void InnerWidget::paintSearchInReplies(
+//		Painter &p,
+//		int top,
+//		const Ui::Text::String &text) const {
+//	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
+//		Ui::EmptyUserpic::PaintRepliesMessages(p, x, y, width(), size);
+//	};
+//	paintSearchInFilter(p, paintUserpic, top, nullptr, text);
+//}
+//
+//void InnerWidget::paintSearchInTopic(
+//		Painter &p,
+//		const Ui::PaintContext &context,
+//		not_null<Data::ForumTopic*> topic,
+//		Ui::PeerUserpicView &userpic,
+//		int top,
+//		const Ui::Text::String &text) const {
+//	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
+//		p.translate(x, y);
+//		topic->paintUserpic(p, userpic, context);
+//		p.translate(-x, -y);
+//	};
+//	paintSearchInFilter(p, paintUserpic, top, nullptr, text);
+//}
 
 void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
 	if (_chatPreviewTouchGlobal || _touchDragStartGlobal) {
@@ -1989,17 +1978,20 @@ void InnerWidget::resizeEvent(QResizeEvent *e) {
 		_searchTags->resizeToWidth(width() - 2 * _searchTagsLeft);
 	}
 	resizeEmpty();
-	moveCancelSearchButtons();
+	moveSearchIn();
 }
 
-void InnerWidget::moveCancelSearchButtons() {
-	const auto widthForCancelButton = qMax(
+void InnerWidget::moveSearchIn() {
+	if (!_searchIn) {
+		return;
+	}
+	const auto searchInWidth = std::max(
 		width(),
 		st::columnMinimalWidthLeft - _narrowWidth);
-	const auto left = widthForCancelButton - st::dialogsSearchInSkip - _cancelSearchFromUser->width();
-	const auto top = (st::dialogsSearchInHeight - st::dialogsCancelSearchInPeer.height) / 2;
-	const auto skip = (_searchTags ? _searchTags->height() : 0);
-	_cancelSearchFromUser->moveToLeft(left, skip + top);
+	_searchIn->resizeToWidth(searchInWidth);
+
+	const auto top = (_searchTags ? _searchTags->height() : 0);
+	_searchIn->moveToLeft(0, top);
 }
 
 void InnerWidget::dialogRowReplaced(
@@ -2656,7 +2648,7 @@ void InnerWidget::applySearchState(SearchState state) {
 			1
 		) | rpl::start_with_next([=] {
 			refresh();
-			moveCancelSearchButtons();
+			moveSearchIn();
 		}, _searchTags->lifetime());
 	} else {
 		_searchTags = nullptr;
@@ -2670,17 +2662,12 @@ void InnerWidget::applySearchState(SearchState state) {
 	if (state.inChat) {
 		onHashtagFilterUpdate(QStringView());
 	}
-	if (_searchFromShown) {
-		_cancelSearchFromUser->show();
-		_searchFromUserUserpic = _searchFromShown->createUserpicView();
-	} else {
-		_cancelSearchFromUser->hide();
-		_searchFromUserUserpic = {};
-	}
-	refreshSearchInChatLabel();
-	moveCancelSearchButtons();
-
 	_searchState = std::move(state);
+	_searchingHashtag = IsHashtagSearchQuery(_searchState.query);
+
+	updateSearchIn();
+	moveSearchIn();
+
 	auto newFilter = _searchState.query;
 	const auto mentionsSearch = (newFilter == u"@"_q);
 	const auto words = mentionsSearch
@@ -2924,12 +2911,20 @@ rpl::producer<> InnerWidget::listBottomReached() const {
 	return _listBottomReached.events();
 }
 
-rpl::producer<> InnerWidget::cancelSearchFromUserRequests() const {
-	return _cancelSearchFromUser->clicks() | rpl::to_empty;
+rpl::producer<ChatSearchTab> InnerWidget::changeSearchTabRequests() const {
+	return _changeSearchTabRequests.events();
 }
 
 rpl::producer<> InnerWidget::cancelSearchRequests() const {
-	return _cancelSearch.events();
+	return _cancelSearchRequests.events();
+}
+
+rpl::producer<> InnerWidget::cancelSearchFromRequests() const {
+	return _cancelSearchFromRequests.events();
+}
+
+rpl::producer<> InnerWidget::changeSearchFromRequests() const {
+	return _changeSearchFromRequests.events();
 }
 
 rpl::producer<Ui::ScrollToRequest> InnerWidget::mustScrollTo() const {
@@ -3200,9 +3195,6 @@ void InnerWidget::refreshEmpty() {
 		} else if (_searchEmptyState != _searchState) {
 			_searchEmptyState = _searchState;
 			_searchEmpty = MakeSearchEmpty(this, _searchState);
-			_searchEmpty->linkClicks() | rpl::start_with_next([=] {
-				_cancelSearch.fire({});
-			}, _searchEmpty->lifetime());
 			if (_controller->session().data().chatsListLoaded()) {
 				_searchEmpty->animate();
 			}
@@ -3342,19 +3334,76 @@ auto InnerWidget::searchTagsChanges() const
 		: rpl::never<std::vector<Data::ReactionId>>();
 }
 
-void InnerWidget::refreshSearchInChatLabel() {
-	const auto from = _searchFromShown ? _searchFromShown->name() : u""_q;
-	if (!from.isEmpty()) {
-		const auto fromUserText = tr::lng_dlg_search_from(
-			tr::now,
-			lt_user,
-			Ui::Text::Semibold(from),
-			Ui::Text::WithEntities);
-		_searchFromUserText.setMarkedText(
-			st::dialogsSearchFromStyle,
-			fromUserText,
-			Ui::DialogTextOptions());
-	}
+void InnerWidget::updateSearchIn() {
+	if (!_searchState.inChat && !_searchingHashtag) {
+		_searchIn = nullptr;
+		return;
+	} else if (!_searchIn) {
+		_searchIn = std::make_unique<ChatSearchIn>(this);
+		_searchIn->show();
+		_searchIn->changeFromRequests() | rpl::start_to_stream(
+			_changeSearchFromRequests,
+			_searchIn->lifetime());
+		_searchIn->cancelFromRequests() | rpl::start_to_stream(
+			_cancelSearchFromRequests,
+			_searchIn->lifetime());
+		_searchIn->cancelInRequests() | rpl::start_to_stream(
+			_cancelSearchRequests,
+			_searchIn->lifetime());
+		_searchIn->tabChanges() | rpl::start_to_stream(
+			_changeSearchTabRequests,
+			_searchIn->lifetime());
+	}
+
+	const auto sublist = _searchState.inChat.sublist();
+	const auto topic = _searchState.inChat.topic();
+	const auto peer = _searchState.inChat.owningHistory()
+		? _searchState.inChat.owningHistory()->peer.get()
+		: _openedForum
+		? _openedForum->channel().get()
+		: nullptr;
+	const auto topicIcon = !topic
+		? nullptr
+		: topic->iconId()
+		? Ui::MakeEmojiThumbnail(
+			&topic->owner(),
+			Data::SerializeCustomEmojiId(topic->iconId()))
+		: Ui::MakeEmojiThumbnail(
+			&topic->owner(),
+			Data::TopicIconEmojiEntity({
+				.title = (topic->isGeneral()
+					? Data::ForumGeneralIconTitle()
+					: topic->title()),
+				.colorId = (topic->isGeneral()
+					? Data::ForumGeneralIconColor(st::windowSubTextFg->c)
+					: topic->colorId()),
+			}));
+	const auto peerIcon = peer
+		? Ui::MakeUserpicThumbnail(peer)
+		: sublist
+		? Ui::MakeUserpicThumbnail(sublist->peer())
+		: nullptr;
+	const auto myIcon = Ui::MakeIconThumbnail(st::menuIconChats);
+	const auto publicIcon = _searchingHashtag
+		? Ui::MakeIconThumbnail(st::menuIconChannel)
+		: nullptr;
+	const auto peerTabType = (peer && peer->isBroadcast())
+		? ChatSearchPeerTabType::Channel
+		: (peer && (peer->isChat() || peer->isMegagroup()))
+		? ChatSearchPeerTabType::Group
+		: ChatSearchPeerTabType::Chat;
+	const auto fromImage = _searchFromShown
+		? Ui::MakeUserpicThumbnail(_searchFromShown)
+		: nullptr;
+	const auto fromName = _searchFromShown
+		? _searchFromShown->shortName()
+		: QString();
+	_searchIn->apply({
+		{ ChatSearchTab::ThisTopic, topicIcon },
+		{ ChatSearchTab::ThisPeer, peerIcon },
+		{ ChatSearchTab::MyMessages, myIcon },
+		{ ChatSearchTab::PublicPosts, publicIcon },
+	}, _searchState.tab, peerTabType, fromImage, fromName);
 }
 
 void InnerWidget::repaintSearchResult(int index) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 9f069c243dd7f..9d74bf8cb0758 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -61,6 +61,7 @@ class FakeRow;
 class IndexedList;
 class SearchTags;
 class SearchEmpty;
+class ChatSearchIn;
 
 struct ChosenRow {
 	Key key;
@@ -156,8 +157,11 @@ class InnerWidget final : public Ui::RpWidget {
 	void setLoadMoreCallback(Fn<void()> callback);
 	void setLoadMoreFilteredCallback(Fn<void()> callback);
 	[[nodiscard]] rpl::producer<> listBottomReached() const;
-	[[nodiscard]] rpl::producer<> cancelSearchFromUserRequests() const;
+	[[nodiscard]] auto changeSearchTabRequests() const
+		-> rpl::producer<ChatSearchTab>;
 	[[nodiscard]] rpl::producer<> cancelSearchRequests() const;
+	[[nodiscard]] rpl::producer<> cancelSearchFromRequests() const;
+	[[nodiscard]] rpl::producer<> changeSearchFromRequests() const;
 	[[nodiscard]] rpl::producer<ChosenRow> chosenRow() const;
 	[[nodiscard]] rpl::producer<> updated() const;
 
@@ -358,38 +362,38 @@ class InnerWidget final : public Ui::RpWidget {
 	void paintSearchTags(
 		Painter &p,
 		const Ui::PaintContext &context) const;
-	void paintSearchInChat(
-		Painter &p,
-		const Ui::PaintContext &context) const;
-	void paintSearchInPeer(
-		Painter &p,
-		not_null<PeerData*> peer,
-		Ui::PeerUserpicView &userpic,
-		int top,
-		const Ui::Text::String &text) const;
-	void paintSearchInSaved(
-		Painter &p,
-		int top,
-		const Ui::Text::String &text) const;
-	void paintSearchInReplies(
-		Painter &p,
-		int top,
-		const Ui::Text::String &text) const;
-	void paintSearchInTopic(
-		Painter &p,
-		const Ui::PaintContext &context,
-		not_null<Data::ForumTopic*> topic,
-		Ui::PeerUserpicView &userpic,
-		int top,
-		const Ui::Text::String &text) const;
-	template <typename PaintUserpic>
-	void paintSearchInFilter(
-		Painter &p,
-		PaintUserpic paintUserpic,
-		int top,
-		const style::icon *icon,
-		const Ui::Text::String &text) const;
-	void refreshSearchInChatLabel();
+	//void paintSearchInChat(
+	//	Painter &p,
+	//	const Ui::PaintContext &context) const;
+	//void paintSearchInPeer(
+	//	Painter &p,
+	//	not_null<PeerData*> peer,
+	//	Ui::PeerUserpicView &userpic,
+	//	int top,
+	//	const Ui::Text::String &text) const;
+	//void paintSearchInSaved(
+	//	Painter &p,
+	//	int top,
+	//	const Ui::Text::String &text) const;
+	//void paintSearchInReplies(
+	//	Painter &p,
+	//	int top,
+	//	const Ui::Text::String &text) const;
+	//void paintSearchInTopic(
+	//	Painter &p,
+	//	const Ui::PaintContext &context,
+	//	not_null<Data::ForumTopic*> topic,
+	//	Ui::PeerUserpicView &userpic,
+	//	int top,
+	//	const Ui::Text::String &text) const;
+	//template <typename PaintUserpic>
+	//void paintSearchInFilter(
+	//	Painter &p,
+	//	PaintUserpic paintUserpic,
+	//	int top,
+	//	const style::icon *icon,
+	//	const Ui::Text::String &text) const;
+	void updateSearchIn();
 	void repaintSearchResult(int index);
 
 	Ui::VideoUserpic *validateVideoUserpic(not_null<Row*> row);
@@ -415,7 +419,7 @@ class InnerWidget final : public Ui::RpWidget {
 	void savePinnedOrder();
 	bool pinnedShiftAnimationCallback(crl::time now);
 	void handleChatListEntryRefreshes();
-	void moveCancelSearchButtons();
+	void moveSearchIn();
 	void dragPinnedFromTouch();
 
 	void saveChatsFilterScrollState(FilterId filterId);
@@ -490,19 +494,22 @@ class InnerWidget final : public Ui::RpWidget {
 
 	WidgetState _state = WidgetState::Default;
 
+	std::unique_ptr<ChatSearchIn> _searchIn;
+	rpl::event_stream<ChatSearchTab> _changeSearchTabRequests;
+	rpl::event_stream<> _cancelSearchRequests;
+	rpl::event_stream<> _cancelSearchFromRequests;
+	rpl::event_stream<> _changeSearchFromRequests;
 	object_ptr<Ui::RpWidget> _loadingAnimation = { nullptr };
 	object_ptr<SearchEmpty> _searchEmpty = { nullptr };
 	SearchState _searchEmptyState;
 	object_ptr<Ui::FlatLabel> _empty = { nullptr };
-	object_ptr<Ui::IconButton> _cancelSearchFromUser;
-	rpl::event_stream<> _cancelSearch;
 
 	Ui::DraggingScrollManager _draggingScroll;
 
 	SearchState _searchState;
+	bool _searchingHashtag = false;
 	History *_searchInMigrated = nullptr;
 	PeerData *_searchFromShown = nullptr;
-	mutable Ui::PeerUserpicView _searchFromUserUserpic;
 	Ui::Text::String _searchFromUserText;
 	std::unique_ptr<SearchTags> _searchTags;
 	int _searchTagsLeft = 0;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_key.cpp b/Telegram/SourceFiles/dialogs/dialogs_key.cpp
index 7c1be62aa94a4..544c48cca8e3e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_key.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_key.cpp
@@ -10,7 +10,7 @@ For license and copyright information please follow this link:
 #include "data/data_folder.h"
 #include "data/data_forum_topic.h"
 #include "data/data_saved_sublist.h"
-#include "dialogs/ui/chat_search_tabs.h"
+#include "dialogs/ui/chat_search_in.h"
 #include "history/history.h"
 
 namespace Dialogs {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 7ff4207040202..d421b0508baf6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -9,7 +9,7 @@ For license and copyright information please follow this link:
 
 #include "base/qt/qt_key_modifiers.h"
 #include "base/options.h"
-#include "dialogs/ui/chat_search_tabs.h"
+#include "dialogs/ui/chat_search_in.h"
 #include "dialogs/ui/dialogs_stories_content.h"
 #include "dialogs/ui/dialogs_stories_list.h"
 #include "dialogs/ui/dialogs_suggestions.h"
@@ -336,7 +336,20 @@ Widget::Widget(
 	) | rpl::start_with_next([=] {
 		searchCursorMoved();
 	}, lifetime());
-	_inner->cancelSearchFromUserRequests(
+	_inner->changeSearchTabRequests(
+	) | rpl::filter([=](ChatSearchTab tab) {
+		return _searchState.tab != tab;
+	}) | rpl::start_with_next([=](ChatSearchTab tab) {
+		auto copy = _searchState;
+		copy.tab = tab;
+		applySearchState(std::move(copy));
+	}, lifetime());
+	_inner->cancelSearchRequests(
+	) | rpl::start_with_next([=] {
+		setInnerFocus(true);
+		applySearchState({});
+	}, lifetime());
+	_inner->cancelSearchFromRequests(
 	) | rpl::start_with_next([=] {
 		auto copy = _searchState;
 		copy.fromPeer = nullptr;
@@ -345,10 +358,9 @@ Widget::Widget(
 		}
 		applySearchState(std::move(copy));
 	}, lifetime());
-	_inner->cancelSearchRequests(
+	_inner->changeSearchFromRequests(
 	) | rpl::start_with_next([=] {
-		setInnerFocus(true);
-		applySearchState({});
+		showSearchFrom();
 	}, lifetime());
 	_inner->chosenRow(
 	) | rpl::start_with_next([=](const ChosenRow &row) {
@@ -1096,9 +1108,6 @@ void Widget::updateControlsVisibility(bool fast) {
 		updateJumpToDateVisibility(fast);
 		updateSearchFromVisibility(fast);
 	}
-	if (_searchTabs) {
-		_searchTabs->show();
-	}
 	if (_connecting) {
 		_connecting->setForceHidden(false);
 	}
@@ -1242,102 +1251,6 @@ void Widget::updateSuggestions(anim::type animated) {
 	}
 }
 
-void Widget::updateSearchTabs() {
-	const auto has = _searchState.inChat || _searchingHashtag;
-	if (!has) {
-		if (_searchTabs) {
-			_searchTabs = nullptr;
-			updateControlsGeometry();
-		}
-		return;
-	} else if (!_searchTabs) {
-		const auto savedSession = &session();
-		const auto markedTextContext = [=](Fn<void()> repaint) {
-			return Core::MarkedTextContext{
-				.session = savedSession,
-				.customEmojiRepaint = std::move(repaint),
-			};
-		};
-		_searchTabs = std::make_unique<ChatSearchTabs>(
-			this,
-			_searchState.tab,
-			std::move(markedTextContext));
-		_searchTabs->setVisible(!_showAnimation);
-		_searchTabs->tabChanges(
-		) | rpl::filter([=](ChatSearchTab tab) {
-			return (_searchState.tab != tab);
-		}) | rpl::start_with_next([=](ChatSearchTab tab) {
-			auto copy = _searchState;
-			copy.tab = tab;
-			applySearchState(std::move(copy));
-		}, _searchTabs->lifetime());
-	}
-	const auto sublist = _searchState.inChat.sublist();
-	const auto topic = _searchState.inChat.topic();
-	const auto peer = _searchState.inChat.owningHistory()
-		? _searchState.inChat.owningHistory()->peer.get()
-		: _openedForum
-		? _openedForum->channel().get()
-		: nullptr;
-	const auto topicShortLabel = !topic
-		? TextWithEntities()
-		: topic->iconId()
-		? Ui::Text::SingleCustomEmoji(
-			Data::SerializeCustomEmojiId(topic->iconId()))
-		: Ui::Text::SingleCustomEmoji(Data::TopicIconEmojiEntity({
-			.title = (topic->isGeneral()
-				? Data::ForumGeneralIconTitle()
-				: topic->title()),
-			.colorId = (topic->isGeneral()
-				? Data::ForumGeneralIconColor(st::windowSubTextFg->c)
-				: topic->colorId()),
-			}));
-	const auto peerShortLabel = peer
-		? Ui::Text::SingleCustomEmoji(
-			session().data().customEmojiManager().peerUserpicEmojiData(
-				peer,
-				{},
-				true))
-		: sublist
-		? Ui::Text::SingleCustomEmoji(
-			session().data().customEmojiManager().peerUserpicEmojiData(
-				sublist->peer(),
-				{},
-				true))
-		: TextWithEntities();
-	const auto myShortLabel = DefaultShortLabel(ChatSearchTab::MyMessages);
-	const auto publicShortLabel = _searchingHashtag
-		? DefaultShortLabel(ChatSearchTab::PublicPosts)
-		: TextWithEntities();
-	if ((_searchState.tab == ChatSearchTab::ThisTopic
-		&& !_searchState.inChat.topic())
-		|| (_searchState.tab == ChatSearchTab::ThisPeer
-			&& !_searchState.inChat
-			&& !_openedForum)
-		|| (_searchState.tab == ChatSearchTab::PublicPosts
-			&& !_searchingHashtag)) {
-		_searchState.tab = _searchState.inChat.topic()
-			? ChatSearchTab::ThisTopic
-			: (_searchState.inChat.owningHistory()
-				|| _searchState.inChat.sublist())
-			? ChatSearchTab::ThisPeer
-			: ChatSearchTab::MyMessages;
-	}
-	const auto peerTabType = (peer && peer->isBroadcast())
-		? ChatSearchPeerTabType::Channel
-		: (peer && (peer->isChat() || peer->isMegagroup()))
-		? ChatSearchPeerTabType::Group
-		: ChatSearchPeerTabType::Chat;
-	_searchTabs->setTabShortLabels({
-		{ ChatSearchTab::ThisTopic, topicShortLabel },
-		{ ChatSearchTab::ThisPeer, peerShortLabel },
-		{ ChatSearchTab::MyMessages, myShortLabel },
-		{ ChatSearchTab::PublicPosts, publicShortLabel },
-	}, _searchState.tab, peerTabType);
-
-	updateControlsGeometry();
-}
-
 void Widget::changeOpenedSubsection(
 		FnMut<void()> change,
 		bool fromRight,
@@ -2732,9 +2645,8 @@ QString Widget::validateSearchQuery() {
 			setSearchQuery(fixed.text, fixed.cursorPosition);
 		}
 		return fixed.text;
-	} else if (_searchingHashtag != IsHashtagSearchQuery(query)) {
-		_searchingHashtag = !_searchingHashtag;
-		updateSearchTabs();
+	} else {
+		_searchingHashtag = IsHashtagSearchQuery(query);
 	}
 	return query;
 }
@@ -2932,7 +2844,7 @@ bool Widget::applySearchState(SearchState state) {
 		state.tab = (_openedForum && !state.inChat)
 			? ChatSearchTab::ThisPeer
 			: ChatSearchTab::MyMessages;
-	} else if (!state.inChat && !_searchTabs) {
+	} else if (!state.inChat && !_searchingHashtag) {
 		state.tab = (forum || _openedForum)
 			? ChatSearchTab::ThisPeer
 			: ChatSearchTab::MyMessages;
@@ -2966,6 +2878,20 @@ bool Widget::applySearchState(SearchState state) {
 		return false;
 	}
 
+	if ((state.tab == ChatSearchTab::ThisTopic
+		&& !state.inChat.topic())
+		|| (state.tab == ChatSearchTab::ThisPeer
+			&& !state.inChat
+			&& !_openedForum)
+		|| (state.tab == ChatSearchTab::PublicPosts
+			&& !_searchingHashtag)) {
+		state.tab = state.inChat.topic()
+			? ChatSearchTab::ThisTopic
+			: (state.inChat.owningHistory() || state.inChat.sublist())
+			? ChatSearchTab::ThisPeer
+			: ChatSearchTab::MyMessages;
+	}
+
 	const auto migrateFrom = (peer && !topic)
 		? peer->migrateFrom()
 		: nullptr;
@@ -2979,7 +2905,6 @@ bool Widget::applySearchState(SearchState state) {
 	}
 	if (inChatChanged) {
 		controller()->setSearchInChat(_searchState.inChat);
-		updateSearchTabs();
 	}
 	if (queryChanged || inChatChanged) {
 		updateCancelSearch();
@@ -3334,9 +3259,6 @@ void Widget::updateControlsGeometry() {
 	if (_forumRequestsBar) {
 		_forumRequestsBar->resizeToWidth(barw);
 	}
-	if (_searchTabs) {
-		_searchTabs->resizeToWidth(barw);
-	}
 	_updateScrollGeometryCached = [=] {
 		const auto moreChatsBarTop = expandedStoriesTop
 			+ ((!_stories || _stories->isHidden()) ? 0 : _aboveScrollAdded);
@@ -3358,13 +3280,8 @@ void Widget::updateControlsGeometry() {
 		if (_forumReportBar) {
 			_forumReportBar->bar().move(0, forumReportTop);
 		}
-		const auto searchTabsTop = forumReportTop
+		const auto scrollTop = forumReportTop
 			+ (_forumReportBar ? _forumReportBar->bar().height() : 0);
-		if (_searchTabs) {
-			_searchTabs->move(0, searchTabsTop);
-		}
-		const auto scrollTop = searchTabsTop
-			+ (_searchTabs ? _searchTabs->height() : 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 33d239a480d3b..29e68a3ccaeb9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -76,7 +76,7 @@ struct ChosenRow;
 class InnerWidget;
 enum class SearchRequestType;
 class Suggestions;
-class ChatSearchTabs;
+class ChatSearchIn;
 enum class ChatSearchTab : uchar;
 
 class Widget final : public Window::AbstractSectionWidget {
@@ -255,7 +255,6 @@ class Widget final : public Window::AbstractSectionWidget {
 	void updateScrollUpPosition();
 	void updateLockUnlockPosition();
 	void updateSuggestions(anim::type animated);
-	void updateSearchTabs();
 	void processSearchFocusChange();
 
 	[[nodiscard]] bool redirectToSearchPossible() const;
@@ -294,7 +293,6 @@ class Widget final : public Window::AbstractSectionWidget {
 	QPointer<InnerWidget> _inner;
 	std::unique_ptr<Suggestions> _suggestions;
 	std::vector<std::unique_ptr<Suggestions>> _hidingSuggestions;
-	std::unique_ptr<ChatSearchTabs> _searchTabs;
 	class BottomButton;
 	object_ptr<BottomButton> _updateTelegram = { nullptr };
 	object_ptr<BottomButton> _loadMoreChats = { nullptr };
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
index 855112f850e73..7c3c7f3937899 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
@@ -33,12 +33,6 @@ void SearchEmpty::setup(Icon icon, rpl::producer<TextWithEntities> text) {
 		this,
 		std::move(text),
 		st::defaultPeerListAbout);
-	label->setClickHandlerFilter([=](const auto &, Qt::MouseButton button) {
-		if (button == Qt::LeftButton) {
-			_linkClicks.fire({});
-		}
-		return false;
-	});
 	const auto size = st::recentPeersEmptySize;
 	const auto animation = [&] {
 		switch (icon) {
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h
index 6ddf52676cf6e..0ad901ad99ed3 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h
@@ -26,9 +26,6 @@ class SearchEmpty final : public Ui::RpWidget {
 		rpl::producer<TextWithEntities> text);
 
 	void setMinimalHeight(int minimalHeight);
-	[[nodiscard]] rpl::producer<> linkClicks() const {
-		return _linkClicks.events();
-	}
 
 	void animate();
 
@@ -36,7 +33,6 @@ class SearchEmpty final : public Ui::RpWidget {
 	void setup(Icon icon, rpl::producer<TextWithEntities> text);
 
 	Fn<void()> _animate;
-	rpl::event_stream<> _linkClicks;
 
 };
 
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp
new file mode 100644
index 0000000000000..0524b3a635d48
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp
@@ -0,0 +1,459 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/ui/chat_search_in.h"
+
+#include "lang/lang_keys.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
+#include "ui/widgets/menu/menu_item_base.h"
+#include "ui/dynamic_image.h"
+#include "ui/painter.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_window.h"
+
+namespace Dialogs {
+namespace {
+
+class Action final : public Ui::Menu::ItemBase {
+public:
+	Action(
+		not_null<Ui::PopupMenu*> parentMenu,
+		std::shared_ptr<Ui::DynamicImage> icon,
+		const QString &label,
+		bool chosen);
+
+	bool isEnabled() const override;
+	not_null<QAction*> action() const override;
+
+	void handleKeyPress(not_null<QKeyEvent*> e) override;
+
+protected:
+	QPoint prepareRippleStartPosition() const override;
+	QImage prepareRippleMask() const override;
+
+	int contentHeight() const override;
+
+private:
+	void paint(Painter &p);
+
+	void resolveMinWidth();
+	void refreshDimensions();
+
+	const not_null<Ui::PopupMenu*> _parentMenu;
+	const not_null<QAction*> _dummyAction;
+	const style::Menu &_st;
+	const int _height = 0;
+
+	std::shared_ptr<Ui::DynamicImage> _icon;
+	Ui::Text::String _text;
+	bool _checked = false;
+
+};
+
+[[nodiscard]] QString TabLabel(
+		ChatSearchTab tab,
+		ChatSearchPeerTabType type = {}) {
+	switch (tab) {
+	case ChatSearchTab::MyMessages:
+		return tr::lng_search_tab_my_messages(tr::now);
+	case ChatSearchTab::ThisTopic:
+		return tr::lng_search_tab_this_topic(tr::now);
+	case ChatSearchTab::ThisPeer:
+		switch (type) {
+		case ChatSearchPeerTabType::Chat:
+			return tr::lng_search_tab_this_chat(tr::now);
+		case ChatSearchPeerTabType::Channel:
+			return tr::lng_search_tab_this_channel(tr::now);
+		case ChatSearchPeerTabType::Group:
+			return tr::lng_search_tab_this_group(tr::now);
+		}
+		Unexpected("Type in Dialogs::TabLabel.");
+	case ChatSearchTab::PublicPosts:
+		return tr::lng_search_tab_public_posts(tr::now);
+	}
+	Unexpected("Tab in Dialogs::TabLabel.");
+}
+
+Action::Action(
+	not_null<Ui::PopupMenu*> parentMenu,
+	std::shared_ptr<Ui::DynamicImage> icon,
+	const QString &label,
+	bool chosen)
+: ItemBase(parentMenu->menu(), parentMenu->menu()->st())
+, _parentMenu(parentMenu)
+, _dummyAction(CreateChild<QAction>(parentMenu->menu().get()))
+, _st(parentMenu->menu()->st())
+, _height(st::dialogsSearchInHeight)
+, _icon(std::move(icon))
+, _checked(chosen) {
+	const auto parent = parentMenu->menu();
+
+	_text.setText(st::semiboldTextStyle, label);
+	_icon->subscribeToUpdates([=] { update(); });
+
+	initResizeHook(parent->sizeValue());
+	resolveMinWidth();
+
+	paintRequest(
+	) | rpl::start_with_next([=] {
+		Painter p(this);
+		paint(p);
+	}, lifetime());
+
+	enableMouseSelecting();
+}
+
+void Action::resolveMinWidth() {
+	const auto maxWidth = st::dialogsSearchInPhotoPadding
+		+ st::dialogsSearchInPhotoSize
+		+ st::dialogsSearchInSkip
+		+ _text.maxWidth()
+		+ st::dialogsSearchInCheckSkip
+		+ st::dialogsSearchInCheck.width()
+		+ st::dialogsSearchInCheckSkip;
+	setMinWidth(maxWidth);
+}
+
+void Action::paint(Painter &p) {
+	const auto enabled = isEnabled();
+	const auto selected = isSelected();
+	if (selected && _st.itemBgOver->c.alpha() < 255) {
+		p.fillRect(0, 0, width(), _height, _st.itemBg);
+	}
+	const auto &bg = selected ? _st.itemBgOver : _st.itemBg;
+	p.fillRect(0, 0, width(), _height, bg);
+	if (enabled) {
+		paintRipple(p, 0, 0);
+	}
+
+	auto x = st::dialogsSearchInPhotoPadding;
+	const auto photos = st::dialogsSearchInPhotoSize;
+	const auto photoy = (height() - photos) / 2;
+	p.drawImage(QRect{ x, photoy, photos, photos }, _icon->image(photos));
+	x += photos + st::dialogsSearchInSkip;
+	const auto available = width()
+		- x
+		- st::dialogsSearchInCheckSkip
+		- st::dialogsSearchInCheck.width()
+		- st::dialogsSearchInCheckSkip;
+
+	p.setPen(!enabled
+		? _st.itemFgDisabled
+		: selected
+		? _st.itemFgOver
+		: _st.itemFg);
+	_text.drawLeftElided(
+		p,
+		x,
+		st::dialogsSearchInNameTop,
+		available,
+		width());
+	x += available;
+	if (_checked) {
+		x += st::dialogsSearchInCheckSkip;
+		const auto &icon = st::dialogsSearchInCheck;
+		const auto icony = (height() - icon.height()) / 2;
+		icon.paint(p, x, icony, width());
+	}
+}
+
+bool Action::isEnabled() const {
+	return true;
+}
+
+not_null<QAction*> Action::action() const {
+	return _dummyAction;
+}
+
+QPoint Action::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos());
+}
+
+QImage Action::prepareRippleMask() const {
+	return Ui::RippleAnimation::RectMask(size());
+}
+
+int Action::contentHeight() const {
+	return _height;
+}
+
+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(Ui::Menu::TriggeredSource::Keyboard);
+	}
+}
+
+} // namespace
+
+FixedHashtagSearchQuery FixHashtagSearchQuery(
+		const QString &query,
+		int cursorPosition) {
+	const auto trimmed = query.trimmed();
+	const auto hash = int(trimmed.isEmpty()
+		? query.size()
+		: query.indexOf(trimmed));
+	const auto start = std::min(cursorPosition, hash);
+	auto result = query.mid(0, start);
+	for (const auto &ch : query.mid(start)) {
+		if (ch.isSpace()) {
+			if (cursorPosition > result.size()) {
+				--cursorPosition;
+			}
+			continue;
+		} else if (result.size() == start) {
+			result += '#';
+			if (ch != '#') {
+				++cursorPosition;
+			}
+		}
+		if (ch != '#') {
+			result += ch;
+		}
+	}
+	if (result.size() == start) {
+		result += '#';
+		++cursorPosition;
+	}
+	return { result, cursorPosition };
+}
+
+bool IsHashtagSearchQuery(const QString &query) {
+	const auto trimmed = query.trimmed();
+	if (trimmed.isEmpty() || trimmed[0] != '#') {
+		return false;
+	}
+	for (const auto &ch : trimmed) {
+		if (ch.isSpace()) {
+			return false;
+		}
+	}
+	return true;
+}
+
+void ChatSearchIn::Section::update() {
+	outer->update();
+}
+
+ChatSearchIn::ChatSearchIn(QWidget *parent)
+: RpWidget(parent) {
+	_in.clicks.events() | rpl::start_with_next([=] {
+		showMenu();
+	}, lifetime());
+}
+
+ChatSearchIn::~ChatSearchIn() = default;
+
+void ChatSearchIn::apply(
+		std::vector<PossibleTab> tabs,
+		ChatSearchTab active,
+		ChatSearchPeerTabType peerTabType,
+		std::shared_ptr<Ui::DynamicImage> fromUserpic,
+		QString fromName) {
+	_tabs = std::move(tabs);
+	_peerTabType = peerTabType;
+	_active = active;
+	const auto i = ranges::find(_tabs, active, &PossibleTab::tab);
+	Assert(i != end(_tabs));
+	Assert(i->icon != nullptr);
+	updateSection(
+		&_in,
+		i->icon->clone(),
+		Ui::Text::Semibold(TabLabel(active, peerTabType)));
+
+	auto text = tr::lng_dlg_search_from(
+		tr::now,
+		lt_user,
+		Ui::Text::Semibold(fromName),
+		Ui::Text::WithEntities);
+	updateSection(&_from, std::move(fromUserpic), std::move(text));
+
+	resizeToWidth(width());
+}
+
+rpl::producer<> ChatSearchIn::cancelInRequests() const {
+	return _in.cancelRequests.events();
+}
+
+rpl::producer<> ChatSearchIn::cancelFromRequests() const {
+	return _from.cancelRequests.events();
+}
+
+rpl::producer<> ChatSearchIn::changeFromRequests() const {
+	return _from.clicks.events();
+}
+
+rpl::producer<ChatSearchTab> ChatSearchIn::tabChanges() const {
+	return _active.changes();
+}
+
+void ChatSearchIn::showMenu() {
+	_menu = base::make_unique_q<Ui::PopupMenu>(
+		this,
+		st::dialogsSearchInMenu);
+	const auto active = _active.current();
+	auto activeIndex = 0;
+	for (const auto &tab : _tabs) {
+		if (!tab.icon) {
+			continue;
+		}
+		const auto value = tab.tab;
+		if (value == active) {
+			activeIndex = _menu->actions().size();
+		}
+		auto action = base::make_unique_q<Action>(
+			_menu.get(),
+			tab.icon,
+			TabLabel(value, _peerTabType),
+			(value == active));
+		action->setClickedCallback([=] {
+			_active = value;
+		});
+		_menu->addAction(std::move(action));
+	}
+	const auto count = int(_menu->actions().size());
+	const auto bottomLeft = (activeIndex * 2 >= count);
+	const auto single = st::dialogsSearchInHeight;
+	const auto in = mapToGlobal(_in.outer->pos()
+		+ QPoint(0, bottomLeft ? count * single : 0));
+	_menu->setForcedOrigin(bottomLeft
+		? Ui::PanelAnimation::Origin::BottomLeft
+		: Ui::PanelAnimation::Origin::TopLeft);
+	if (_menu->prepareGeometryFor(in)) {
+		_menu->move(_menu->pos() - QPoint(_menu->inner().x(), activeIndex * single));
+		_menu->popupPrepared();
+	}
+}
+
+void ChatSearchIn::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+	const auto top = QRect(0, 0, width(), st::searchedBarHeight);
+	p.fillRect(top, st::searchedBarBg);
+	p.fillRect(rect().translated(0, st::searchedBarHeight), st::dialogsBg);
+
+	p.setFont(st::searchedBarFont);
+	p.setPen(st::searchedBarFg);
+	p.drawTextLeft(
+		st::searchedBarPosition.x(),
+		st::searchedBarPosition.y(),
+		width(),
+		tr::lng_dlg_search_in(tr::now));
+}
+
+int ChatSearchIn::resizeGetHeight(int newWidth) {
+	auto result = st::searchedBarHeight;
+	if (const auto raw = _in.outer.get()) {
+		raw->resizeToWidth(newWidth);
+		raw->move(0, result);
+		result += raw->height();
+		_in.shadow->setGeometry(0, result, newWidth, st::lineWidth);
+		result += st::lineWidth;
+	}
+	if (const auto raw = _from.outer.get()) {
+		raw->resizeToWidth(newWidth);
+		raw->move(0, result);
+		result += raw->height();
+		_from.shadow->setGeometry(0, result, newWidth, st::lineWidth);
+		result += st::lineWidth;
+	}
+	return result;
+}
+
+void ChatSearchIn::updateSection(
+		not_null<Section*> section,
+		std::shared_ptr<Ui::DynamicImage> image,
+		TextWithEntities text) {
+	if (section->subscribed) {
+		section->image->subscribeToUpdates(nullptr);
+		section->subscribed = false;
+	}
+	if (!image) {
+		if (section->outer) {
+			section->cancel = nullptr;
+			section->shadow = nullptr;
+			section->outer = nullptr;
+			section->subscribed = false;
+		}
+		return;
+	} else if (!section->outer) {
+		auto button = std::make_unique<Ui::AbstractButton>(this);
+		const auto raw = button.get();
+		section->outer = std::move(button);
+
+		raw->resize(
+			st::columnMinimalWidthLeft,
+			st::dialogsSearchInHeight);
+
+		raw->paintRequest() | rpl::start_with_next([=] {
+			auto p = QPainter(raw);
+			if (!section->subscribed) {
+				section->subscribed = true;
+				section->image->subscribeToUpdates([=] {
+					raw->update();
+				});
+			}
+			const auto outer = raw->width();
+			const auto size = st::dialogsSearchInPhotoSize;
+			const auto left = st::dialogsSearchInPhotoPadding;
+			const auto top = (st::dialogsSearchInHeight - size) / 2;
+			p.drawImage(
+				QRect{ left, top, size, size },
+				section->image->image(size));
+
+			const auto x = left + size + st::dialogsSearchInSkip;
+			const auto available = outer
+				- st::dialogsSearchInSkip
+				- section->cancel->width()
+				- 2 * st::dialogsSearchInDownSkip
+				- st::dialogsSearchInDown.width()
+				- x;
+			const auto use = std::min(section->text.maxWidth(), available);
+			const auto iconx = x + use + st::dialogsSearchInDownSkip;
+			const auto icony = st::dialogsSearchInDownTop;
+			st::dialogsSearchInDown.paint(p, iconx, icony, outer);
+			p.setPen(st::windowBoldFg);
+			section->text.draw(p, {
+				.position = QPoint(x, st::dialogsSearchInNameTop),
+				.outerWidth = outer,
+				.availableWidth = available,
+				.elisionLines = 1,
+			});
+		}, raw->lifetime());
+
+		section->shadow = std::make_unique<Ui::PlainShadow>(this);
+		section->shadow->show();
+
+		const auto st = &st::dialogsCancelSearchInPeer;
+		section->cancel = std::make_unique<Ui::IconButton>(raw, *st);
+		section->cancel->show();
+		raw->sizeValue() | rpl::start_with_next([=](QSize size) {
+			const auto left = size.width() - section->cancel->width();
+			const auto top = (size.height() - st->height) / 2;
+			section->cancel->moveToLeft(left, top);
+		}, section->cancel->lifetime());
+		section->cancel->clicks() | rpl::to_empty | rpl::start_to_stream(
+			section->cancelRequests,
+			section->cancel->lifetime());
+
+		raw->clicks() | rpl::to_empty | rpl::start_to_stream(
+			section->clicks,
+			raw->lifetime());
+
+		raw->show();
+	}
+	section->image = std::move(image);
+	section->text.setMarkedText(st::dialogsSearchFromStyle, std::move(text));
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_in.h b/Telegram/SourceFiles/dialogs/ui/chat_search_in.h
new file mode 100644
index 0000000000000..5e99f2d056f65
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_in.h
@@ -0,0 +1,100 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/unique_qptr.h"
+#include "ui/rp_widget.h"
+
+namespace Ui {
+class PlainShadow;
+class DynamicImage;
+class IconButton;
+class PopupMenu;
+} // namespace Ui
+
+namespace Dialogs {
+
+enum class ChatSearchTab : uchar {
+	MyMessages,
+	ThisTopic,
+	ThisPeer,
+	PublicPosts,
+};
+
+enum class ChatSearchPeerTabType : uchar {
+	Chat,
+	Channel,
+	Group,
+};
+
+class ChatSearchIn final : public Ui::RpWidget {
+public:
+	explicit ChatSearchIn(QWidget *parent);
+	~ChatSearchIn();
+
+	struct PossibleTab {
+		ChatSearchTab tab = {};
+		std::shared_ptr<Ui::DynamicImage> icon;
+	};
+	void apply(
+		std::vector<PossibleTab> tabs,
+		ChatSearchTab active,
+		ChatSearchPeerTabType peerTabType,
+		std::shared_ptr<Ui::DynamicImage> fromUserpic,
+		QString fromName);
+
+	[[nodiscard]] rpl::producer<> cancelInRequests() const;
+	[[nodiscard]] rpl::producer<> cancelFromRequests() const;
+	[[nodiscard]] rpl::producer<> changeFromRequests() const;
+	[[nodiscard]] rpl::producer<ChatSearchTab> tabChanges() const;
+
+private:
+	struct Section {
+		std::unique_ptr<Ui::RpWidget> outer;
+		std::unique_ptr<Ui::IconButton> cancel;
+		std::unique_ptr<Ui::PlainShadow> shadow;
+		std::shared_ptr<Ui::DynamicImage> image;
+		Ui::Text::String text;
+		rpl::event_stream<> clicks;
+		rpl::event_stream<> cancelRequests;
+		bool subscribed = false;
+
+		void update();
+	};
+
+	int resizeGetHeight(int newWidth) override;
+	void paintEvent(QPaintEvent *e) override;
+	void showMenu();
+
+	void updateSection(
+		not_null<Section*> section,
+		std::shared_ptr<Ui::DynamicImage> image,
+		TextWithEntities text);
+
+	Section _in;
+	Section _from;
+	rpl::variable<ChatSearchTab> _active;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	std::vector<PossibleTab> _tabs;
+	ChatSearchPeerTabType _peerTabType = ChatSearchPeerTabType::Chat;
+
+};
+
+struct FixedHashtagSearchQuery {
+	QString text;
+	int cursorPosition = 0;
+};
+[[nodiscard]] FixedHashtagSearchQuery FixHashtagSearchQuery(
+	const QString &query,
+	int cursorPosition);
+
+[[nodiscard]] bool IsHashtagSearchQuery(const QString &query);
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
deleted file mode 100644
index 24fc2150754c4..0000000000000
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "dialogs/ui/chat_search_tabs.h"
-
-#include "lang/lang_keys.h"
-#include "ui/widgets/discrete_sliders.h"
-#include "ui/widgets/shadow.h"
-#include "styles/style_dialogs.h"
-
-namespace Dialogs {
-namespace {
-
-[[nodiscard]] QString TabLabel(
-		ChatSearchTab tab,
-		ChatSearchPeerTabType type = {}) {
-	switch (tab) {
-	case ChatSearchTab::MyMessages:
-		return tr::lng_search_tab_my_messages(tr::now);
-	case ChatSearchTab::ThisTopic:
-		return tr::lng_search_tab_this_topic(tr::now);
-	case ChatSearchTab::ThisPeer:
-		switch (type) {
-		case ChatSearchPeerTabType::Chat:
-			return tr::lng_search_tab_this_chat(tr::now);
-		case ChatSearchPeerTabType::Channel:
-			return tr::lng_search_tab_this_channel(tr::now);
-		case ChatSearchPeerTabType::Group:
-			return tr::lng_search_tab_this_group(tr::now);
-		}
-		Unexpected("Type in Dialogs::TabLabel.");
-	case ChatSearchTab::PublicPosts:
-		return tr::lng_search_tab_public_posts(tr::now);
-	}
-	Unexpected("Tab in Dialogs::TabLabel.");
-}
-
-} // namespace
-
-TextWithEntities DefaultShortLabel(ChatSearchTab tab) {
-	// Return them in QString::fromUtf8 format.
-	switch (tab) {
-	case ChatSearchTab::MyMessages:
-		return { QString::fromUtf8("\xf0\x9f\x93\xa8") };
-	case ChatSearchTab::PublicPosts:
-		return { QString::fromUtf8("\xf0\x9f\x8c\x8e") };
-	}
-	Unexpected("Tab in Dialogs::DefaultShortLabel.");
-}
-
-FixedHashtagSearchQuery FixHashtagSearchQuery(
-		const QString &query,
-		int cursorPosition) {
-	const auto trimmed = query.trimmed();
-	const auto hash = int(trimmed.isEmpty()
-		? query.size()
-		: query.indexOf(trimmed));
-	const auto start = std::min(cursorPosition, hash);
-	auto result = query.mid(0, start);
-	for (const auto &ch : query.mid(start)) {
-		if (ch.isSpace()) {
-			if (cursorPosition > result.size()) {
-				--cursorPosition;
-			}
-			continue;
-		} else if (result.size() == start) {
-			result += '#';
-			if (ch != '#') {
-				++cursorPosition;
-			}
-		}
-		if (ch != '#') {
-			result += ch;
-		}
-	}
-	if (result.size() == start) {
-		result += '#';
-		++cursorPosition;
-	}
-	return { result, cursorPosition };
-}
-
-bool IsHashtagSearchQuery(const QString &query) {
-	const auto trimmed = query.trimmed();
-	if (trimmed.isEmpty() || trimmed[0] != '#') {
-		return false;
-	}
-	for (const auto &ch : trimmed) {
-		if (ch.isSpace()) {
-			return false;
-		}
-	}
-	return true;
-}
-
-ChatSearchTabs::ChatSearchTabs(
-	QWidget *parent,
-	ChatSearchTab active,
-	Fn<std::any(Fn<void()>)> markedTextContext)
-: RpWidget(parent)
-, _tabs(std::make_unique<Ui::SettingsSlider>(this, st::dialogsSearchTabs))
-, _shadow(std::make_unique<Ui::PlainShadow>(this))
-, _markedTextContext(std::move(markedTextContext))
-, _active(active) {
-	_tabs->move(st::dialogsSearchTabsPadding, 0);
-	_tabs->sectionActivated(
-	) | rpl::start_with_next([=](int index) {
-		_active = _list[index].value;
-	}, lifetime());
-}
-
-ChatSearchTabs::~ChatSearchTabs() = default;
-
-void ChatSearchTabs::setTabShortLabels(
-		std::vector<ShortLabel> labels,
-		ChatSearchTab active,
-		ChatSearchPeerTabType peerTabType) {
-	const auto &st = st::dialogsSearchTabs;
-	const auto &font = st.labelStyle.font;
-	_list.clear();
-	_list.reserve(labels.size());
-
-	auto widthTotal = 0;
-	for (const auto tab : {
-		ChatSearchTab::ThisTopic,
-		ChatSearchTab::ThisPeer,
-		ChatSearchTab::MyMessages,
-		ChatSearchTab::PublicPosts,
-	}) {
-		const auto i = ranges::find(labels, tab, &ShortLabel::tab);
-		if (i != end(labels) && !i->label.empty()) {
-			const auto label = TabLabel(tab, peerTabType);
-			const auto widthFull = font->width(label) + st.strictSkip;
-			_list.push_back({
-				.value = tab,
-				.label = label,
-				.shortLabel = i->label,
-				.widthFull = widthFull,
-			});
-			widthTotal += widthFull;
-		}
-	}
-	const auto widthSingleEmoji = st::emojiSize + st.strictSkip;
-	for (const auto tab : {
-		ChatSearchTab::PublicPosts,
-		ChatSearchTab::ThisTopic,
-		ChatSearchTab::ThisPeer,
-		ChatSearchTab::MyMessages,
-	}) {
-		const auto i = ranges::find(_list, tab, &Tab::value);
-		if (i != end(_list)) {
-			i->widthThresholdForShort = widthTotal;
-			widthTotal -= i->widthFull;
-			widthTotal += widthSingleEmoji;
-		}
-	}
-	refillTabs(active, width());
-}
-
-rpl::producer<ChatSearchTab> ChatSearchTabs::tabChanges() const {
-	return _active.changes();
-}
-
-void ChatSearchTabs::refillTabs(
-		ChatSearchTab active,
-		int newWidth) {
-	auto labels = std::vector<TextWithEntities>();
-	const auto available = newWidth - 2 * st::dialogsSearchTabsPadding;
-	for (const auto &tab : _list) {
-		auto label = (available < tab.widthThresholdForShort)
-			? tab.shortLabel
-			: TextWithEntities{ tab.label };
-		labels.push_back(std::move(label));
-	}
-	_tabs->setSections(labels, _markedTextContext([=] { update(); }));
-
-	const auto i = ranges::find(_list, active, &Tab::value);
-	Assert(i != end(_list));
-	_tabs->setActiveSectionFast(i - begin(_list));
-	_tabs->resizeToWidth(newWidth);
-}
-
-int ChatSearchTabs::resizeGetHeight(int newWidth) {
-	refillTabs(_active.current(), newWidth);
-	_shadow->setGeometry(
-		0,
-		_tabs->y() + _tabs->height() - st::lineWidth,
-		newWidth,
-		st::lineWidth);
-	return _tabs->height();
-}
-
-void ChatSearchTabs::paintEvent(QPaintEvent *e) {
-	QPainter(this).fillRect(e->rect(), st::dialogsBg);
-}
-
-} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h b/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h
deleted file mode 100644
index 720bf573456a0..0000000000000
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_tabs.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "ui/rp_widget.h"
-
-namespace Ui {
-class SettingsSlider;
-class PlainShadow;
-} // namespace Ui
-
-namespace Dialogs {
-
-enum class ChatSearchTab : uchar {
-	MyMessages,
-	ThisTopic,
-	ThisPeer,
-	PublicPosts,
-};
-
-enum class ChatSearchPeerTabType : uchar {
-	Chat,
-	Channel,
-	Group,
-};
-
-// Available for MyMessages and PublicPosts.
-[[nodiscard]] TextWithEntities DefaultShortLabel(ChatSearchTab tab);
-
-class ChatSearchTabs final : public Ui::RpWidget {
-public:
-	ChatSearchTabs(
-		QWidget *parent,
-		ChatSearchTab active,
-		Fn<std::any(Fn<void()>)> markedTextContext);
-	~ChatSearchTabs();
-
-	// A [custom] emoji to use when there is not enough space for text.
-	// Only tabs with available short labels are shown.
-	struct ShortLabel {
-		ChatSearchTab tab = {};
-		TextWithEntities label;
-	};
-	void setTabShortLabels(
-		std::vector<ShortLabel> labels,
-		ChatSearchTab active,
-		ChatSearchPeerTabType peerTabType);
-
-	[[nodiscard]] rpl::producer<ChatSearchTab> tabChanges() const;
-
-private:
-	struct Tab {
-		ChatSearchTab value = {};
-		QString label;
-		TextWithEntities shortLabel;
-		int widthFull = 0;
-		int widthThresholdForShort = 0;
-	};
-
-	void refreshTabs(ChatSearchTab active);
-	void refillTabs(ChatSearchTab active, int newWidth);
-	int resizeGetHeight(int newWidth) override;
-	void paintEvent(QPaintEvent *e) override;
-
-	const std::unique_ptr<Ui::SettingsSlider> _tabs;
-	const std::unique_ptr<Ui::PlainShadow> _shadow;
-	const Fn<std::any(Fn<void()>)> _markedTextContext;
-
-	std::vector<Tab> _list;
-	rpl::variable<ChatSearchTab> _active;
-
-};
-
-struct FixedHashtagSearchQuery {
-	QString text;
-	int cursorPosition = 0;
-};
-[[nodiscard]] FixedHashtagSearchQuery FixHashtagSearchQuery(
-	const QString &query,
-	int cursorPosition);
-
-[[nodiscard]] bool IsHashtagSearchQuery(const QString &query);
-
-} // namespace Dialogs
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 44644cffe2d6b..20748d9fa09c7 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -379,6 +379,10 @@ bool Gif::autoplayEnabled() const {
 		_data);
 }
 
+bool Gif::hideMessageText() const {
+	return _data->isVideoMessage();
+}
+
 void Gif::draw(Painter &p, const PaintContext &context) const {
 	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h
index 840b12587441c..f0460bf0d5814 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h
@@ -54,9 +54,7 @@ class Gif final : public File {
 		bool spoiler);
 	~Gif();
 
-	bool hideMessageText() const override {
-		return false;
-	}
+	bool hideMessageText() const override;
 
 	void draw(Painter &p, const PaintContext &context) const override;
 	TextState textState(QPoint point, StateRequest request) const override;
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
index b9ea1ad0e5ae0..fdbd4b69f0ebc 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
@@ -14,6 +14,8 @@ For license and copyright information please follow this link:
 #include "data/data_peer.h"
 #include "data/data_photo.h"
 #include "data/data_photo_media.h"
+#include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_story.h"
 #include "main/main_session.h"
 #include "ui/empty_userpic.h"
@@ -28,6 +30,8 @@ class PeerUserpic final : public DynamicImage {
 public:
 	PeerUserpic(not_null<PeerData*> peer, bool forceRound);
 
+	std::shared_ptr<DynamicImage> clone() override;
+
 	QImage image(int size) override;
 	void subscribeToUpdates(Fn<void()> callback) override;
 
@@ -58,7 +62,6 @@ class PeerUserpic final : public DynamicImage {
 class StoryThumbnail : public DynamicImage {
 public:
 	explicit StoryThumbnail(FullStoryId id);
-	virtual ~StoryThumbnail() = default;
 
 	QImage image(int size) override;
 	void subscribeToUpdates(Fn<void()> callback) override;
@@ -68,6 +71,9 @@ class StoryThumbnail : public DynamicImage {
 		Image *image = nullptr;
 		bool blurred = false;
 	};
+
+	[[nodiscard]] FullStoryId id() const;
+
 	[[nodiscard]] virtual Main::Session &session() = 0;
 	[[nodiscard]] virtual Thumb loaded(FullStoryId id) = 0;
 	virtual void clear() = 0;
@@ -85,6 +91,8 @@ class PhotoThumbnail final : public StoryThumbnail {
 public:
 	PhotoThumbnail(not_null<PhotoData*> photo, FullStoryId id);
 
+	std::shared_ptr<DynamicImage> clone() override;
+
 private:
 	Main::Session &session() override;
 	Thumb loaded(FullStoryId id) override;
@@ -99,6 +107,8 @@ class VideoThumbnail final : public StoryThumbnail {
 public:
 	VideoThumbnail(not_null<DocumentData*> video, FullStoryId id);
 
+	std::shared_ptr<DynamicImage> clone() override;
+
 private:
 	Main::Session &session() override;
 	Thumb loaded(FullStoryId id) override;
@@ -111,6 +121,8 @@ class VideoThumbnail final : public StoryThumbnail {
 
 class EmptyThumbnail final : public DynamicImage {
 public:
+	std::shared_ptr<DynamicImage> clone() override;
+
 	QImage image(int size) override;
 	void subscribeToUpdates(Fn<void()> callback) override;
 
@@ -121,6 +133,8 @@ class EmptyThumbnail final : public DynamicImage {
 
 class SavedMessagesUserpic final : public DynamicImage {
 public:
+	std::shared_ptr<DynamicImage> clone() override;
+
 	QImage image(int size) override;
 	void subscribeToUpdates(Fn<void()> callback) override;
 
@@ -132,6 +146,8 @@ class SavedMessagesUserpic final : public DynamicImage {
 
 class RepliesUserpic final : public DynamicImage {
 public:
+	std::shared_ptr<DynamicImage> clone() override;
+
 	QImage image(int size) override;
 	void subscribeToUpdates(Fn<void()> callback) override;
 
@@ -141,11 +157,48 @@ class RepliesUserpic final : public DynamicImage {
 
 };
 
+class IconThumbnail final : public DynamicImage {
+public:
+	explicit IconThumbnail(const style::icon &icon);
+
+	std::shared_ptr<DynamicImage> clone() override;
+
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	const style::icon &_icon;
+	int _paletteVersion = 0;
+	QImage _frame;
+
+};
+
+class EmojiThumbnail final : public DynamicImage {
+public:
+	EmojiThumbnail(not_null<Data::Session*> owner, const QString &data);
+
+	std::shared_ptr<DynamicImage> clone() override;
+
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	const not_null<Data::Session*> _owner;
+	const QString _data;
+	std::unique_ptr<Ui::Text::CustomEmoji> _emoji;
+	QImage _frame;
+
+};
+
 PeerUserpic::PeerUserpic(not_null<PeerData*> peer, bool forceRound)
 : _peer(peer)
 , _forceRound(forceRound) {
 }
 
+std::shared_ptr<DynamicImage> PeerUserpic::clone() {
+	return std::make_shared<PeerUserpic>(_peer, _forceRound);
+}
+
 QImage PeerUserpic::image(int size) {
 	Expects(_subscribed != nullptr);
 
@@ -280,11 +333,19 @@ void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
 	}
 }
 
+FullStoryId StoryThumbnail::id() const {
+	return _id;
+}
+
 PhotoThumbnail::PhotoThumbnail(not_null<PhotoData*> photo, FullStoryId id)
 : StoryThumbnail(id)
 , _photo(photo) {
 }
 
+std::shared_ptr<DynamicImage> PhotoThumbnail::clone() {
+	return std::make_shared<PhotoThumbnail>(_photo, id());
+}
+
 Main::Session &PhotoThumbnail::session() {
 	return _photo->session();
 }
@@ -311,6 +372,10 @@ VideoThumbnail::VideoThumbnail(
 , _video(video) {
 }
 
+std::shared_ptr<DynamicImage> VideoThumbnail::clone() {
+	return std::make_shared<VideoThumbnail>(_video, id());
+}
+
 Main::Session &VideoThumbnail::session() {
 	return _video->session();
 }
@@ -330,6 +395,10 @@ void VideoThumbnail::clear() {
 	_media = nullptr;
 }
 
+std::shared_ptr<DynamicImage> EmptyThumbnail::clone() {
+	return std::make_shared<EmptyThumbnail>();
+}
+
 QImage EmptyThumbnail::image(int size) {
 	const auto ratio = style::DevicePixelRatio();
 	if (_cached.width() != size * ratio) {
@@ -345,6 +414,10 @@ QImage EmptyThumbnail::image(int size) {
 void EmptyThumbnail::subscribeToUpdates(Fn<void()> callback) {
 }
 
+std::shared_ptr<DynamicImage> SavedMessagesUserpic::clone() {
+	return std::make_shared<SavedMessagesUserpic>();
+}
+
 QImage SavedMessagesUserpic::image(int size) {
 	const auto good = (_frame.width() == size * _frame.devicePixelRatio());
 	const auto paletteVersion = style::PaletteVersion();
@@ -367,6 +440,13 @@ QImage SavedMessagesUserpic::image(int size) {
 }
 
 void SavedMessagesUserpic::subscribeToUpdates(Fn<void()> callback) {
+	if (!callback) {
+		_frame = {};
+	}
+}
+
+std::shared_ptr<DynamicImage> RepliesUserpic::clone() {
+	return std::make_shared<RepliesUserpic>();
 }
 
 QImage RepliesUserpic::image(int size) {
@@ -391,6 +471,90 @@ QImage RepliesUserpic::image(int size) {
 }
 
 void RepliesUserpic::subscribeToUpdates(Fn<void()> callback) {
+	if (!callback) {
+		_frame = {};
+	}
+}
+
+IconThumbnail::IconThumbnail(const style::icon &icon) : _icon(icon) {
+}
+
+std::shared_ptr<DynamicImage> IconThumbnail::clone() {
+	return std::make_shared<IconThumbnail>(_icon);
+}
+
+QImage IconThumbnail::image(int size) {
+	const auto good = (_frame.width() == size * _frame.devicePixelRatio());
+	const auto paletteVersion = style::PaletteVersion();
+	if (!good || _paletteVersion != paletteVersion) {
+		_paletteVersion = paletteVersion;
+
+		const auto ratio = style::DevicePixelRatio();
+		if (!good) {
+			_frame = QImage(
+				QSize(size, size) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_frame.setDevicePixelRatio(ratio);
+		}
+		_frame.fill(Qt::transparent);
+
+		auto p = Painter(&_frame);
+		_icon.paintInCenter(p, QRect(0, 0, size, size));
+	}
+	return _frame;
+}
+
+void IconThumbnail::subscribeToUpdates(Fn<void()> callback) {
+	if (!callback) {
+		_frame = {};
+	}
+}
+
+EmojiThumbnail::EmojiThumbnail(
+	not_null<Data::Session*> owner,
+	const QString &data)
+: _owner(owner)
+, _data(data) {
+}
+
+void EmojiThumbnail::subscribeToUpdates(Fn<void()> callback) {
+	if (!callback) {
+		_emoji = nullptr;
+		return;
+	}
+	_emoji = _owner->customEmojiManager().create(
+		_data,
+		std::move(callback),
+		Data::CustomEmojiSizeTag::Large);
+}
+
+std::shared_ptr<DynamicImage> EmojiThumbnail::clone() {
+	return std::make_shared<EmojiThumbnail>(_owner, _data);
+}
+
+QImage EmojiThumbnail::image(int size) {
+	Expects(_emoji != nullptr);
+
+	const auto ratio = style::DevicePixelRatio();
+	const auto good = (_frame.width() == size * _frame.devicePixelRatio());
+	if (!good) {
+		_frame = QImage(
+			QSize(size, size) * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		_frame.setDevicePixelRatio(ratio);
+	}
+	_frame.fill(Qt::transparent);
+
+	auto p = Painter(&_frame);
+	_emoji->paint(p, {
+		.textColor = st::windowBoldFg->c,
+		.now = crl::now(),
+		.position = QPoint(0, 0),
+		.paused = false,
+	});
+	p.end();
+
+	return _frame;
 }
 
 } // namespace
@@ -422,4 +586,14 @@ std::shared_ptr<DynamicImage> MakeStoryThumbnail(
 	});
 }
 
+std::shared_ptr<DynamicImage> MakeIconThumbnail(const style::icon &icon) {
+	return std::make_shared<IconThumbnail>(icon);
+}
+
+std::shared_ptr<DynamicImage> MakeEmojiThumbnail(
+		not_null<Data::Session*> owner,
+		const QString &data) {
+	return std::make_shared<EmojiThumbnail>(owner, data);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.h b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
index 4b4e0e5530cf9..df36ae984e66d 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.h
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
@@ -11,6 +11,7 @@ class PeerData;
 
 namespace Data {
 class Story;
+class Session;
 } // namespace Data
 
 namespace Ui {
@@ -24,5 +25,10 @@ class DynamicImage;
 [[nodiscard]] std::shared_ptr<DynamicImage> MakeRepliesThumbnail();
 [[nodiscard]] std::shared_ptr<DynamicImage> MakeStoryThumbnail(
 	not_null<Data::Story*> story);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeIconThumbnail(
+	const style::icon &icon);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeEmojiThumbnail(
+	not_null<Data::Session*> owner,
+	const QString &data);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 8f2c0f8610fab..8d08ff7de5591 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -136,6 +136,7 @@ menuIconGroupCreate: icon {{ "menu/groups_create", menuIconColor }};
 menuIconSigned: icon {{ "menu/signed", menuIconColor }};
 menuIconAntispam: icon {{ "menu/antispam", menuIconColor }};
 menuIconChatDiscuss: icon {{ "menu/chat_discuss", menuIconColor }};
+menuIconChats: icon {{ "menu/chats", menuIconColor }};
 menuIconBotCommands: icon {{ "menu/bot_commands", menuIconColor }};
 menuIconPremium: icon {{ "menu/premium", menuIconColor }};
 menuIconShop: icon {{ "menu/shop", menuIconColor }};
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 29a2c10b007ed..2b69b2df7906b 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -89,8 +89,8 @@ PRIVATE
     dialogs/dialogs_three_state_icon.h
     dialogs/ui/chat_search_empty.cpp
     dialogs/ui/chat_search_empty.h
-    dialogs/ui/chat_search_tabs.cpp
-    dialogs/ui/chat_search_tabs.h
+    dialogs/ui/chat_search_in.cpp
+    dialogs/ui/chat_search_in.h
     dialogs/ui/dialogs_stories_list.cpp
     dialogs/ui/dialogs_stories_list.h
     dialogs/ui/top_peers_strip.cpp
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d0a7ff7734b6f..7b48c6a3618c7 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d0a7ff7734b6f887dc6367742c40c50729c032e3
+Subproject commit 7b48c6a3618c7953046914ca4c6fe739684644b8

From 9176bf2e470b60296f9db8adde267d7f3573829a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 6 Jun 2024 14:58:11 +0400
Subject: [PATCH 352/400] Update lib_webview

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 36f65327aaf61..ecf6c59cfe6b0 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 36f65327aaf61cfb9c4fba8f3cb08a35cbcb6556
+Subproject commit ecf6c59cfe6b05ffb0154b8b7b2ec5fe2cb4b7cd

From aafa8631e024b3072f1e8e4907a971b430807be3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 6 Jun 2024 19:33:03 +0300
Subject: [PATCH 353/400] Moved out url for credits terms to lang pack.

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

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0aea70cdb5a1e..fa1aab1b885c2 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2316,6 +2316,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_summary_options_more" = "More Options";
 "lng_credits_summary_options_about" = "By proceeding and purchasing Stars, you agree with the {link}.";
 "lng_credits_summary_options_about_link" = "Terms and Conditions";
+"lng_credits_summary_options_about_url" = "https://telegram.org/tos/stars";
 "lng_credits_summary_history_tab_full" = "All Transactions";
 "lng_credits_summary_history_tab_in" = "Incoming";
 "lng_credits_summary_history_tab_out" = "Outgoing";
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index b855121a455c0..c42b611e97d5c 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -269,10 +269,11 @@ void FillCreditOptions(
 		{
 			auto text = tr::lng_credits_summary_options_about(
 				lt_link,
-				tr::lng_credits_summary_options_about_link(
-				) | rpl::map([](const QString &t) {
-					using namespace Ui::Text;
-					return Link(t, u"https://telegram.org/tos"_q);
+				rpl::combine(
+					tr::lng_credits_summary_options_about_link(),
+					tr::lng_credits_summary_options_about_url()
+				) | rpl::map([](const QString &text, const QString &url) {
+					return Ui::Text::Link(text, url);
 				}),
 				Ui::Text::RichLangValue);
 			Ui::AddSkip(content);

From 86a048a0214be2690f8f526b644e7586bed3fc93 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Jun 2024 21:13:53 +0400
Subject: [PATCH 354/400] Update libvpx to 1.14.1.

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index f41aa85a87a4b..02c3f9f3e935b 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -172,7 +172,7 @@ FROM builder AS libvpx
 RUN git init libvpx \
 	&& cd libvpx \
 	&& git remote add origin {{ GIT }}/webmproject/libvpx.git \
-	&& git fetch --depth=1 origin 51057f4ba894e13f9bba278905bacf6aaaecd992 \
+	&& git fetch --depth=1 origin 12f3a2ac603e8f10742105519e0cd03c3b8f71dd \
 	&& git reset --hard FETCH_HEAD \
 	&& CFLAGS="$CFLAGS -fno-lto" CXXFLAGS="$CXXFLAGS -fno-lto" ./configure \
 		--disable-examples \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 8384492e62bea..c4a1e64bb04e9 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -983,7 +983,7 @@ def runStages():
     git clone https://github.com/webmproject/libvpx.git
 depends:patches/libvpx/*.patch
     cd libvpx
-    git checkout 51057f4ba8
+    git checkout v1.14.1
 win:
     for /r %%i in (..\\patches\\libvpx\\*) do git apply %%i
 

From d5d9da7d0a19011842bd4c6644dac3bda5a7ab24 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Jun 2024 21:14:09 +0400
Subject: [PATCH 355/400] Allow scheduling media in topic groups.

---
 .../view/history_view_replies_section.cpp     | 40 +++----------------
 1 file changed, 6 insertions(+), 34 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index cf2ef8d8168a5..492992642c7c8 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -224,11 +224,7 @@ RepliesWidget::RepliesWidget(
 			listShowPremiumToast(emoji);
 		},
 		.mode = ComposeControls::Mode::Normal,
-		.sendMenuDetails = [=] {
-			using Type = SendMenu::Type;
-			const auto type = _topic ? Type::Scheduled : Type::SilentOnly;
-			return SendMenu::Details{ .type = type };
-		},
+		.sendMenuDetails = [=] { return sendMenuDetails(); },
 		.regularWindow = controller,
 		.stickerOrEmojiChosen = controller->stickerOrEmojiChosen(),
 		.scheduledToggleValue = _topic
@@ -955,7 +951,7 @@ bool RepliesWidget::confirmSendingFiles(
 		_composeControls->getTextWithAppliedMarkdown(),
 		_history->peer,
 		Api::SendType::Normal,
-		SendMenu::Details{ SendMenu::Type::SilentOnly }); // #TODO replies schedule
+		sendMenuDetails());
 
 	box->setConfirmedCallback(crl::guard(this, [=](
 			Ui::PreparedList &&list,
@@ -1088,7 +1084,6 @@ void RepliesWidget::checkReplyReturns() {
 void RepliesWidget::uploadFile(
 		const QByteArray &fileContent,
 		SendMediaType type) {
-	// #TODO replies schedule
 	session().api().sendFile(fileContent, type, prepareSendAction({}));
 }
 
@@ -1138,7 +1133,7 @@ bool RepliesWidget::showSendingFilesError(
 }
 
 Api::SendAction RepliesWidget::prepareSendAction(
-	Api::SendOptions options) const {
+		Api::SendOptions options) const {
 	auto result = Api::SendAction(_history, options);
 	result.replyTo = replyTo();
 	result.options.sendAs = _composeControls->sendAsPeer();
@@ -1150,11 +1145,6 @@ void RepliesWidget::send() {
 		return;
 	}
 	send({});
-	// #TODO replies schedule
-	//const auto callback = [=](Api::SendOptions options) { send(options); };
-	//Ui::show(
-	//	PrepareScheduleBox(this, sendMenuType(), callback),
-	//	Ui::LayerOption::KeepOther);
 }
 
 void RepliesWidget::sendVoice(ComposeControls::VoiceToSend &&data) {
@@ -1338,13 +1328,6 @@ void RepliesWidget::refreshJoinGroupButton() {
 void RepliesWidget::sendExistingDocument(
 		not_null<DocumentData*> document) {
 	sendExistingDocument(document, {}, std::nullopt);
-	// #TODO replies schedule
-	//const auto callback = [=](Api::SendOptions options) {
-	//	sendExistingDocument(document, options);
-	//};
-	//Ui::show(
-	//	PrepareScheduleBox(this, sendMenuType(), callback),
-	//	Ui::LayerOption::KeepOther);
 }
 
 bool RepliesWidget::sendExistingDocument(
@@ -1374,13 +1357,6 @@ bool RepliesWidget::sendExistingDocument(
 
 void RepliesWidget::sendExistingPhoto(not_null<PhotoData*> photo) {
 	sendExistingPhoto(photo, {});
-	// #TODO replies schedule
-	//const auto callback = [=](Api::SendOptions options) {
-	//	sendExistingPhoto(photo, options);
-	//};
-	//Ui::show(
-	//	PrepareScheduleBox(this, sendMenuType(), callback),
-	//	Ui::LayerOption::KeepOther);
 }
 
 bool RepliesWidget::sendExistingPhoto(
@@ -1451,13 +1427,9 @@ void RepliesWidget::sendInlineResult(
 }
 
 SendMenu::Details RepliesWidget::sendMenuDetails() const {
-	// #TODO replies schedule
-	const auto type = _history->peer->isSelf()
-		? SendMenu::Type::Reminder
-		: HistoryView::CanScheduleUntilOnline(_history->peer)
-		? SendMenu::Type::ScheduledToUser
-		: SendMenu::Type::Scheduled;
-	return { .type = type, .effectAllowed = _history->peer->isUser() };
+	using Type = SendMenu::Type;
+	const auto type = _topic ? Type::Scheduled : Type::SilentOnly;
+	return SendMenu::Details{ .type = type };
 }
 
 FullReplyTo RepliesWidget::replyTo() const {

From 14909ae913a32a25e7677eb9447b27970d087eb6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Jun 2024 21:43:31 +0400
Subject: [PATCH 356/400] Fix empty space to the right of photo media.

---
 .../history/view/media/history_view_extended_preview.cpp   | 4 ++++
 .../history/view/media/history_view_extended_preview.h     | 1 +
 .../SourceFiles/history/view/media/history_view_photo.cpp  | 7 +++++++
 .../SourceFiles/history/view/media/history_view_photo.h    | 1 +
 4 files changed, 13 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
index 582e952652ce3..9c1a73a64a366 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.cpp
@@ -113,6 +113,10 @@ void ExtendedPreview::unloadHeavyPart() {
 	_spoiler.animation = nullptr;
 }
 
+bool ExtendedPreview::enforceBubbleWidth() const {
+	return true;
+}
+
 QSize ExtendedPreview::countOptimalSize() {
 	const auto &preview = _invoice->extendedPreview;
 	const auto dimensions = preview.dimensions;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.h b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.h
index 0e645456ee79b..da2cd5d14ea8f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_extended_preview.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_extended_preview.h
@@ -54,6 +54,7 @@ class ExtendedPreview final : public Media {
 
 	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
+	bool enforceBubbleWidth() const override;
 
 private:
 	int minWidthForButton() const;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index db309ee621665..2205625d88cca 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -162,6 +162,10 @@ void Photo::unloadHeavyPart() {
 	togglePollingStory(false);
 }
 
+bool Photo::enforceBubbleWidth() const {
+	return true;
+}
+
 void Photo::togglePollingStory(bool enabled) const {
 	const auto pollingStory = (enabled ? 1 : 0);
 	if (!_storyId || _pollingStory == pollingStory) {
@@ -193,6 +197,9 @@ QSize Photo::countOptimalSize() {
 	auto maxWidth = qMax(maxActualWidth, scaled.height());
 	auto minHeight = qMax(scaled.height(), st::minPhotoSize);
 	if (_parent->hasBubble()) {
+		const auto captionMaxWidth = _parent->textualMaxWidth();
+		const auto maxWithCaption = qMin(st::msgMaxWidth, captionMaxWidth);
+		maxWidth = qMin(qMax(maxWidth, maxWithCaption), st::msgMaxWidth);
 		minHeight = adjustHeightForLessCrop(
 			dimensions,
 			{ maxWidth, minHeight });
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.h b/Telegram/SourceFiles/history/view/media/history_view_photo.h
index 8b50f52ac1d3b..44fbed00c7a48 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.h
@@ -88,6 +88,7 @@ class Photo final : public File {
 
 	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
+	bool enforceBubbleWidth() const override;
 
 protected:
 	float64 dataProgress() const override;

From deb50ee5284b6719d615529b5083ac0ec8732d8b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Jun 2024 22:08:10 +0400
Subject: [PATCH 357/400] Fix video full-window toggle in windowed mode.

---
 .../media/view/media_view_overlay_widget.cpp  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 836887e8cd62e..6d7e8d73b9cae 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1886,9 +1886,18 @@ void OverlayWidget::contentSizeChanged() {
 }
 
 void OverlayWidget::recountSkipTop() {
-	const auto bottom = (!_streamed || !_streamed->controls)
-		? height()
-		: (_streamed->controls->y() - st::mediaviewCaptionPadding.bottom());
+	const auto controllerBottomNoFullScreenVideo = _groupThumbs
+		? _groupThumbsTop
+		: height();
+	// We need the bottom in case of non-full-screen-video mode
+	// to count correct _availableHeight in non-full-screen-video mode.
+	//
+	// Originally this is controls->y() - padding.bottom().
+	const auto bottom = (_streamed && _streamed->controls)
+		? (controllerBottomNoFullScreenVideo
+			- _streamed->controls->height()
+			- 2 * st::mediaviewCaptionPadding.bottom())
+		: height();
 	const auto skipHeightBottom = (height() - bottom);
 	_skipTop = _minUsedTop + std::min(
 		std::max(
@@ -1954,7 +1963,7 @@ void OverlayWidget::resizeContentByScreenSize() {
 		_h = _height;
 	}
 	_x = (width() - _w) / 2;
-	_y = _skipTop + (_availableHeight - _h) / 2;
+	_y = _skipTop + (useh - _h) / 2;
 	_geometryAnimation.stop();
 }
 
@@ -4016,7 +4025,7 @@ void OverlayWidget::refreshClipControllerGeometry() {
 		st::mediaviewControllerSize.height());
 	_streamed->controls->move(
 		(width() - controllerWidth) / 2,
-		(controllerBottom
+		(controllerBottom // Duplicated in recountSkipTop().
 			- _streamed->controls->height()
 			- st::mediaviewCaptionPadding.bottom()));
 	Ui::SendPendingMoveResizeEvents(_streamed->controls.get());

From 9e77e80f92701541a97051b0e679efc24618205d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Jun 2024 22:14:54 +0400
Subject: [PATCH 358/400] Moderation on context menu album delete.

Fixes #28012.
---
 .../SourceFiles/history/history_inner_widget.cpp     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index f450af658c0fd..c232aaa1cd65b 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -4350,10 +4350,16 @@ void HistoryInner::deleteAsGroup(FullMsgId itemId) {
 		const auto group = session().data().groups().find(item);
 		if (!group) {
 			return deleteItem(item);
+		} else if (CanCreateModerateMessagesBox(group->items)) {
+			_controller->show(Box(
+				CreateModerateMessagesBox,
+				group->items,
+				nullptr));
+		} else {
+			_controller->show(Box<DeleteMessagesBox>(
+				&session(),
+				session().data().itemsToIds(group->items)));
 		}
-		_controller->show(Box<DeleteMessagesBox>(
-			&session(),
-			session().data().itemsToIds(group->items)));
 	}
 }
 

From a48cd5f15ac06055c8064c900efdb95969c53b90 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Jun 2024 22:17:30 +0400
Subject: [PATCH 359/400] Don't show IV buttons on old Windows.

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index ecf6c59cfe6b0..f266f0f8ba226 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit ecf6c59cfe6b05ffb0154b8b7b2ec5fe2cb4b7cd
+Subproject commit f266f0f8ba22653c66f89919c26be27274dc3f6c

From 2935721cd08cf1b16a27b2fef3ee34dc4f89d569 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Jun 2024 22:19:53 +0400
Subject: [PATCH 360/400] Version 5.1.4.

- Improve design of search in chat.
- Show vCard information for shared contacts.
- Allow scheduling media in topic groups.
- Several minor bugfixes.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 7 +++++++
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 41b08aafcee1f..c57f9ee8d78fd 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.1.3.0" />
+    Version="5.1.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 bf726f1800210..bb6d27a030c88 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,1,3,0
- PRODUCTVERSION 5,1,3,0
+ FILEVERSION 5,1,4,0
+ PRODUCTVERSION 5,1,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.1.3.0"
+            VALUE "FileVersion", "5.1.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.3.0"
+            VALUE "ProductVersion", "5.1.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 26660717b3999..e0c2f27506a9a 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,1,3,0
- PRODUCTVERSION 5,1,3,0
+ FILEVERSION 5,1,4,0
+ PRODUCTVERSION 5,1,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.1.3.0"
+            VALUE "FileVersion", "5.1.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.3.0"
+            VALUE "ProductVersion", "5.1.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index a4a4b57e7db83..d141709f2a214 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 = 5001003;
-constexpr auto AppVersionStr = "5.1.3";
+constexpr auto AppVersion = 5001004;
+constexpr auto AppVersionStr = "5.1.4";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 79b3cd70cb539..a3391f305eb0e 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5001003
+AppVersion         5001004
 AppVersionStrMajor 5.1
-AppVersionStrSmall 5.1.3
-AppVersionStr      5.1.3
+AppVersionStrSmall 5.1.4
+AppVersionStr      5.1.4
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.1.3
+AppVersionOriginal 5.1.4
diff --git a/changelog.txt b/changelog.txt
index b3b778e2c7f59..9422d9f324bec 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+5.1.4 (06.06.24)
+
+- Improve design of search in chat.
+- Show vCard information for shared contacts.
+- Allow scheduling media in topic groups.
+- Several minor bugfixes.
+
 5.1.3 (04.06.24)
 
 - Rebuild version for macOS to fix the phrases.

From 9229de2658c44f8126a8270b5cf135e184ba008c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Jun 2024 06:57:06 +0400
Subject: [PATCH 361/400] Return webview on Windows.

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index f266f0f8ba226..66ed73106e018 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit f266f0f8ba22653c66f89919c26be27274dc3f6c
+Subproject commit 66ed73106e0180d8ae92c9c9a272e4a8d76ff336

From 6c0ea0eb9f666fce471ed32efe0e83d9c62aba48 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Jun 2024 06:57:27 +0400
Subject: [PATCH 362/400] Version 5.1.5.

- Return WebView 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          | 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 c57f9ee8d78fd..68f8a47f7147a 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.1.4.0" />
+    Version="5.1.5.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index bb6d27a030c88..d9a60a870f757 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,1,4,0
- PRODUCTVERSION 5,1,4,0
+ FILEVERSION 5,1,5,0
+ PRODUCTVERSION 5,1,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.1.4.0"
+            VALUE "FileVersion", "5.1.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.4.0"
+            VALUE "ProductVersion", "5.1.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index e0c2f27506a9a..afbc675ba79f7 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,1,4,0
- PRODUCTVERSION 5,1,4,0
+ FILEVERSION 5,1,5,0
+ PRODUCTVERSION 5,1,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.1.4.0"
+            VALUE "FileVersion", "5.1.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.4.0"
+            VALUE "ProductVersion", "5.1.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index d141709f2a214..aac395fa23f0f 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 = 5001004;
-constexpr auto AppVersionStr = "5.1.4";
+constexpr auto AppVersion = 5001005;
+constexpr auto AppVersionStr = "5.1.5";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index a3391f305eb0e..e382b01adc064 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5001004
+AppVersion         5001005
 AppVersionStrMajor 5.1
-AppVersionStrSmall 5.1.4
-AppVersionStr      5.1.4
+AppVersionStrSmall 5.1.5
+AppVersionStr      5.1.5
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.1.4
+AppVersionOriginal 5.1.5
diff --git a/changelog.txt b/changelog.txt
index 9422d9f324bec..c91e229ac02c3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+5.1.5 (07.06.24)
+
+- Return WebView on Windows.
+
 5.1.4 (06.06.24)
 
 - Improve design of search in chat.

From 0e6470a087ee6ef127f32a094007ebdfc316604d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jun 2024 15:47:40 +0400
Subject: [PATCH 363/400] Don't restrict Saved Messages by premium-only
 privacy.

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

diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index f4f8faccd653c..4f45efda24694 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -433,7 +433,7 @@ bool UserData::someRequirePremiumToWrite() const {
 }
 
 bool UserData::meRequiresPremiumToWrite() const {
-	return (flags() & UserDataFlag::MeRequiresPremiumToWrite);
+	return !isSelf() && (flags() & UserDataFlag::MeRequiresPremiumToWrite);
 }
 
 bool UserData::requirePremiumToWriteKnown() const {

From 392df8b56f3c6b0486b4309ec070f06769a86206 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jun 2024 16:24:41 +0400
Subject: [PATCH 364/400] Fix search in archived chats and return back.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index d421b0508baf6..9963ee7e98d20 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -346,8 +346,8 @@ Widget::Widget(
 	}, lifetime());
 	_inner->cancelSearchRequests(
 	) | rpl::start_with_next([=] {
-		setInnerFocus(true);
-		applySearchState({});
+		cancelSearch(true);
+		controller->widget()->setInnerFocus();
 	}, lifetime());
 	_inner->cancelSearchFromRequests(
 	) | rpl::start_with_next([=] {
@@ -2823,6 +2823,9 @@ bool Widget::applySearchState(SearchState state) {
 		}
 		hideChildList();
 	}
+	if (state.inChat && _layout == Layout::Main) {
+		controller()->closeFolder();
+	}
 
 	// Adjust state to be consistent.
 	if (const auto peer = state.inChat.peer()) {
@@ -2929,10 +2932,6 @@ bool Widget::applySearchState(SearchState state) {
 		_peerSearchQuery = QString();
 	}
 
-	if (_searchState.inChat && _layout == Layout::Main) {
-		controller()->closeFolder();
-	}
-
 	if (_searchState.query != currentSearchQuery()) {
 		setSearchQuery(_searchState.query);
 	}

From c585112e37da9592d19d87f10ec993658a14f646 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jun 2024 16:33:58 +0400
Subject: [PATCH 365/400] Fix jump to archive from search in chat.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 28 ++++++++++++-------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  7 ++++-
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 9963ee7e98d20..068c3081536d5 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -346,7 +346,10 @@ Widget::Widget(
 	}, lifetime());
 	_inner->cancelSearchRequests(
 	) | rpl::start_with_next([=] {
-		cancelSearch(true);
+		cancelSearch({
+			.forceFullCancel = true,
+			.jumpBackToSearchedChat = true,
+		});
 		controller->widget()->setInnerFocus();
 	}, lifetime());
 	_inner->cancelSearchFromRequests(
@@ -418,7 +421,9 @@ Widget::Widget(
 		}, lifetime());
 	}
 
-	_cancelSearch->setClickedCallback([this] { cancelSearch(); });
+	_cancelSearch->setClickedCallback([this] {
+		cancelSearch({ .jumpBackToSearchedChat = true });
+	});
 	_jumpToDate->entity()->setClickedCallback([this] { showCalendar(); });
 	_chooseFromUser->entity()->setClickedCallback([this] { showSearchFrom(); });
 	rpl::single(rpl::empty) | rpl::then(
@@ -687,7 +692,7 @@ void Widget::setupMoreChatsBar() {
 	controller()->activeChatsFilter(
 	) | rpl::start_with_next([=](FilterId id) {
 		storiesToggleExplicitExpand(false);
-		const auto cancelled = cancelSearch(true);
+		const auto cancelled = cancelSearch({ .forceFullCancel = true });
 		const auto guard = gsl::finally([&] {
 			if (cancelled) {
 				controller()->content()->dialogsCancelled();
@@ -1162,7 +1167,7 @@ bool Widget::cancelSearchByMouseBack() {
 	return _searchHasFocus
 		&& !_searchSuggestionsLocked
 		&& !_searchState.inChat
-		&& cancelSearch();
+		&& cancelSearch({ .jumpBackToSearchedChat = true });
 }
 
 void Widget::processSearchFocusChange() {
@@ -1301,7 +1306,7 @@ void Widget::changeOpenedFolder(Data::Folder *folder, anim::type animated) {
 		return;
 	}
 	changeOpenedSubsection([&] {
-		cancelSearch(true);
+		cancelSearch({ .forceFullCancel = true });
 		closeChildList(anim::type::instant);
 		controller()->closeForum();
 		_openedFolder = folder;
@@ -1355,7 +1360,7 @@ void Widget::changeOpenedForum(Data::Forum *forum, anim::type animated) {
 		return;
 	}
 	changeOpenedSubsection([&] {
-		cancelSearch(true);
+		cancelSearch({ .forceFullCancel = true });
 		closeChildList(anim::type::instant);
 		_openedForum = forum;
 		_searchState.tab = forum
@@ -1838,7 +1843,7 @@ void Widget::slideFinished() {
 }
 
 void Widget::escape() {
-	if (!cancelSearch()) {
+	if (!cancelSearch({ .jumpBackToSearchedChat = true })) {
 		if (controller()->shownForum().current()) {
 			controller()->closeForum();
 		} else if (controller()->openedFolder().current()) {
@@ -2692,7 +2697,7 @@ void Widget::showForum(
 		changeOpenedForum(forum, params.animated);
 		return;
 	}
-	cancelSearch(true);
+	cancelSearch({ .forceFullCancel = true });
 	openChildList(forum, params);
 }
 
@@ -3572,10 +3577,11 @@ void Widget::setSearchQuery(const QString &query, int cursorPosition) {
 	}
 }
 
-bool Widget::cancelSearch(bool forceFullCancel) {
+bool Widget::cancelSearch(CancelSearchOptions options) {
 	cancelSearchRequest();
 	auto updatedState = _searchState;
 	const auto clearingQuery = !updatedState.query.isEmpty();
+	const auto forceFullCancel = options.forceFullCancel;
 	auto clearingInChat = (forceFullCancel || !clearingQuery)
 		&& (updatedState.inChat
 			|| updatedState.fromPeer
@@ -3584,7 +3590,9 @@ bool Widget::cancelSearch(bool forceFullCancel) {
 		updatedState.query = QString();
 	}
 	if (clearingInChat) {
-		if (updatedState.inChat && controller()->adaptive().isOneColumn()) {
+		if (options.jumpBackToSearchedChat
+			&& updatedState.inChat
+			&& controller()->adaptive().isOneColumn()) {
 			if (const auto thread = updatedState.inChat.thread()) {
 				controller()->showThread(thread);
 			} else {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 29e68a3ccaeb9..9a1e736d990b8 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -131,7 +131,6 @@ class Widget final : public Window::AbstractSectionWidget {
 	bool floatPlayerHandleWheelEvent(QEvent *e) override;
 	QRect floatPlayerAvailableRect() override;
 
-	bool cancelSearch(bool forceFullCancel = false);
 	bool cancelSearchByMouseBack();
 
 	QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
@@ -261,6 +260,12 @@ class Widget final : public Window::AbstractSectionWidget {
 	[[nodiscard]] bool redirectKeyToSearch(QKeyEvent *e) const;
 	[[nodiscard]] bool redirectImeToSearch() const;
 
+	struct CancelSearchOptions {
+		bool forceFullCancel = false;
+		bool jumpBackToSearchedChat = false;
+	};
+	bool cancelSearch(CancelSearchOptions options = {});
+
 	MTP::Sender _api;
 
 	bool _dragInScroll = false;

From cbcdeae2004a25f62e089602b29f8abdf3c85437 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jun 2024 18:08:36 +0400
Subject: [PATCH 366/400] Don't show topic buttons in topic preview.

---
 .../admin_log/history_admin_log_inner.cpp     |  4 ++
 .../admin_log/history_admin_log_inner.h       |  2 +
 .../history/history_inner_widget.cpp          |  4 ++
 .../view/history_view_chat_preview.cpp        | 56 +++++++++++++------
 .../history/view/history_view_element.cpp     |  8 ++-
 .../history/view/history_view_element.h       |  2 +
 .../history/view/history_view_list_widget.cpp |  5 ++
 .../history/view/history_view_list_widget.h   |  4 +-
 .../history/view/history_view_message.cpp     |  3 +-
 .../view/history_view_pinned_section.cpp      |  5 ++
 .../view/history_view_pinned_section.h        |  1 +
 .../view/history_view_replies_section.cpp     |  5 ++
 .../view/history_view_replies_section.h       |  1 +
 .../view/history_view_scheduled_section.cpp   |  5 ++
 .../view/history_view_scheduled_section.h     |  1 +
 .../view/history_view_sublist_section.cpp     |  5 ++
 .../view/history_view_sublist_section.h       |  1 +
 .../business/settings_shortcut_messages.cpp   |  6 ++
 18 files changed, 97 insertions(+), 21 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 cb099afe4ec1c..973a44a21a868 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -683,6 +683,10 @@ QString InnerWidget::elementAuthorRank(not_null<const Element*> view) {
 	return {};
 }
 
+bool InnerWidget::elementHideTopicButton(not_null<const Element*> view) {
+	return false;
+}
+
 void InnerWidget::saveState(not_null<SectionMemento*> memento) {
 	memento->setFilter(std::move(_filter));
 	memento->setAdmins(std::move(_admins));
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
index bbe3c03813e93..5f55e5d40751f 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
@@ -141,6 +141,8 @@ class InnerWidget final
 		HistoryView::Element *replacing) override;
 	QString elementAuthorRank(
 		not_null<const HistoryView::Element*> view) override;
+	bool elementHideTopicButton(
+		not_null<const HistoryView::Element*> view) override;
 
 	~InnerWidget();
 
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index c232aaa1cd65b..46d1a4612bbe1 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -324,6 +324,10 @@ class HistoryMainElementDelegate final
 		return {};
 	}
 
+	bool elementHideTopicButton(not_null<const Element*> view) override {
+		return false;
+	}
+
 	not_null<HistoryView::ElementDelegate*> delegate() override {
 		return this;
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 91540a7291ba4..dddc3669522ec 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -126,6 +126,7 @@ class Item final
 		Painter &p,
 		const Ui::ChatPaintContext &context) override;
 	QString listElementAuthorRank(not_null<const Element*> view) override;
+	bool listElementHideTopicButton(not_null<const Element*> view) override;
 	History *listTranslateHistory() override;
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
@@ -279,6 +280,8 @@ void Item::setupTop() {
 	const auto topic = _thread->asTopic();
 	auto nameValue = (topic
 		? Info::Profile::TitleValue(topic)
+		: _thread->peer()->isSelf()
+		? tr::lng_saved_messages()
 		: Info::Profile::NameValue(_thread->peer())
 	) | rpl::start_spawning(_top->lifetime());
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(
@@ -294,18 +297,24 @@ void Item::setupTop() {
 	) | rpl::map([](StatusFields &&fields) {
 		return fields.text;
 	});
-	const auto status = Ui::CreateChild<Ui::FlatLabel>(
-		_top.get(),
-		(topic
-			? Info::Profile::NameValue(topic->channel())
-			: std::move(statusText)),
-		st::previewStatus);
-	std::move(statusFields) | rpl::start_with_next([=](const StatusFields &fields) {
-		status->setTextColorOverride(fields.active
-			? st::windowActiveTextFg->c
-			: std::optional<QColor>());
-	}, status->lifetime());
-	status->setAttribute(Qt::WA_TransparentForMouseEvents);
+	const auto status = _thread->peer()->isSelf()
+		? nullptr
+		: Ui::CreateChild<Ui::FlatLabel>(
+			_top.get(),
+			(topic
+				? Info::Profile::NameValue(topic->channel())
+				: std::move(statusText)),
+			st::previewStatus);
+	if (status) {
+		std::move(
+			statusFields
+		) | rpl::start_with_next([=](const StatusFields &fields) {
+			status->setTextColorOverride(fields.active
+				? st::windowActiveTextFg->c
+				: std::optional<QColor>());
+		}, status->lifetime());
+		status->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
 	const auto userpic = topic
 		? nullptr
 		: Ui::CreateChild<Ui::UserpicButton>(
@@ -313,6 +322,7 @@ void Item::setupTop() {
 			_thread->peer(),
 			st::previewUserpic);
 	if (userpic) {
+		userpic->showSavedMessagesOnSelf(true);
 		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 	}
 	const auto icon = topic
@@ -334,15 +344,23 @@ void Item::setupTop() {
 		name->resizeToNaturalWidth(width
 			- st.namePosition.x()
 			- st.photoPosition.x());
-		name->move(st::previewTop.namePosition);
+		if (status) {
+			name->move(st::previewTop.namePosition);
+		} else {
+			name->move(
+				st::previewTop.namePosition.x(),
+				(st::previewTop.height - name->height()) / 2);
+		}
 	}, name->lifetime());
 
 	_top->geometryValue() | rpl::start_with_next([=](QRect geometry) {
 		const auto &st = st::previewTop;
-		status->resizeToWidth(geometry.width()
-			- st.statusPosition.x()
-			- st.photoPosition.x());
-		status->move(st.statusPosition);
+		if (status) {
+			status->resizeToWidth(geometry.width()
+				- st.statusPosition.x()
+				- st.photoPosition.x());
+			status->move(st.statusPosition);
+		}
 		shadow->setGeometry(
 			geometry.x(),
 			geometry.y() + geometry.height(),
@@ -673,6 +691,10 @@ QString Item::listElementAuthorRank(not_null<const Element*> view) {
 	return {};
 }
 
+bool Item::listElementHideTopicButton(not_null<const Element*> view) {
+	return _thread->asTopic() != nullptr;
+}
+
 History *Item::listTranslateHistory() {
 	return nullptr;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index df32ee082f84f..b85001331ac65 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -198,10 +198,16 @@ void DefaultElementDelegate::elementStartEffect(
 }
 
 QString DefaultElementDelegate::elementAuthorRank(
-	not_null<const Element*> view) {
+		not_null<const Element*> view) {
 	return {};
 }
 
+bool DefaultElementDelegate::elementHideTopicButton(
+		not_null<const Element*> view) {
+	return true;
+}
+
+
 SimpleElementDelegate::SimpleElementDelegate(
 	not_null<Window::SessionController*> controller,
 	Fn<void()> update)
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 0c01e97672260..d4139e8ec33ca 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -117,6 +117,7 @@ class ElementDelegate {
 		not_null<const Element*> view,
 		Element *replacing) = 0;
 	virtual QString elementAuthorRank(not_null<const Element*> view) = 0;
+	virtual bool elementHideTopicButton(not_null<const Element*> view) = 0;
 
 	virtual ~ElementDelegate() {
 	}
@@ -170,6 +171,7 @@ class DefaultElementDelegate : public ElementDelegate {
 		not_null<const Element*> view,
 		Element *replacing) override;
 	QString elementAuthorRank(not_null<const Element*> view) override;
+	bool elementHideTopicButton(not_null<const Element*> view) override;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 9c125252ca2a0..eb5e079ad1365 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1867,6 +1867,11 @@ QString ListWidget::elementAuthorRank(not_null<const Element*> view) {
 	return _delegate->listElementAuthorRank(view);
 }
 
+bool ListWidget::elementHideTopicButton(not_null<const Element*> view) {
+	return _delegate->listElementHideTopicButton(view);
+}
+
+
 void ListWidget::saveState(not_null<ListMemento*> memento) {
 	memento->setAroundPosition(_aroundPosition);
 	const auto state = countScrollState();
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index 5cfc57c0824ad..d0507474f40fb 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -155,6 +155,7 @@ class ListDelegate {
 		Painter &p,
 		const Ui::ChatPaintContext &context) = 0;
 	virtual QString listElementAuthorRank(not_null<const Element*> view) = 0;
+	virtual bool listElementHideTopicButton(not_null<const Element*> view) = 0;
 	virtual History *listTranslateHistory() = 0;
 	virtual void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) = 0;
@@ -368,7 +369,7 @@ class ListWidget final
 	[[nodiscard]] auto replyToMessageRequested() const
 		-> rpl::producer<ReplyToMessageRequest>;
 	void replyToMessageRequestNotify(
-		FullReplyTo to, 
+		FullReplyTo to,
 		bool forceAnotherChat = false);
 	[[nodiscard]] rpl::producer<FullMsgId> readMessageRequested() const;
 	[[nodiscard]] rpl::producer<FullMsgId> showMessageRequested() const;
@@ -425,6 +426,7 @@ class ListWidget final
 		not_null<const Element*> view,
 		Element *replacing) override;
 	QString elementAuthorRank(not_null<const Element*> view) override;
+	bool elementHideTopicButton(not_null<const Element*> view) override;
 
 	void setEmptyInfoWidget(base::unique_qptr<Ui::RpWidget> &&w);
 	void overrideIsChatWide(bool isWide);
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index cd10f2399c160..0d93ee0b6cf1d 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1037,8 +1037,7 @@ QSize Message::performCountOptimalSize() {
 void Message::refreshTopicButton() {
 	const auto item = data();
 	if (isAttachedToPrevious()
-		|| (context() != Context::History
-			&& context() != Context::ChatPreview)) {
+		|| delegate()->elementHideTopicButton(this)) {
 		_topicButton = nullptr;
 	} else if (const auto topic = item->topic()) {
 		if (!_topicButton) {
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 51a3101ebf0bb..7a9ecd8dcccf2 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -679,6 +679,11 @@ QString PinnedWidget::listElementAuthorRank(not_null<const Element*> view) {
 	return {};
 }
 
+bool PinnedWidget::listElementHideTopicButton(
+		not_null<const Element*> view) {
+	return true;
+}
+
 History *PinnedWidget::listTranslateHistory() {
 	return _history;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index 2c54e0684d244..75956e403d038 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -132,6 +132,7 @@ class PinnedWidget final
 		Painter &p,
 		const Ui::ChatPaintContext &context) override;
 	QString listElementAuthorRank(not_null<const Element*> view) override;
+	bool listElementHideTopicButton(not_null<const Element*> view) override;
 	History *listTranslateHistory() override;
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 492992642c7c8..738377b58cca2 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -2614,6 +2614,11 @@ QString RepliesWidget::listElementAuthorRank(not_null<const Element*> view) {
 		: QString();
 }
 
+bool RepliesWidget::listElementHideTopicButton(
+		not_null<const Element*> view) {
+	return true;
+}
+
 History *RepliesWidget::listTranslateHistory() {
 	return _history;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 37c8540fdefba..c8bacc2c7d74e 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -175,6 +175,7 @@ class RepliesWidget final
 		Painter &p,
 		const Ui::ChatPaintContext &context) override;
 	QString listElementAuthorRank(not_null<const Element*> view) override;
+	bool listElementHideTopicButton(not_null<const Element*> view) override;
 	History *listTranslateHistory() override;
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index bd4a1123b65dc..045b5b8302b3e 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -1450,6 +1450,11 @@ QString ScheduledWidget::listElementAuthorRank(
 	return {};
 }
 
+bool ScheduledWidget::listElementHideTopicButton(
+		not_null<const Element*> view) {
+	return true;
+}
+
 History *ScheduledWidget::listTranslateHistory() {
 	return nullptr;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index b2b0efa41d4fc..ba48137136468 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -159,6 +159,7 @@ class ScheduledWidget final
 		Painter &p,
 		const Ui::ChatPaintContext &context) override;
 	QString listElementAuthorRank(not_null<const Element*> view) override;
+	bool listElementHideTopicButton(not_null<const Element*> view) override;
 	History *listTranslateHistory() override;
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
index df4f4ea048c4e..424aaa5f02e5e 100644
--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
@@ -736,6 +736,11 @@ QString SublistWidget::listElementAuthorRank(not_null<const Element*> view) {
 	return {};
 }
 
+bool SublistWidget::listElementHideTopicButton(
+		not_null<const Element*> view) {
+	return true;
+}
+
 History *SublistWidget::listTranslateHistory() {
 	return _history;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.h b/Telegram/SourceFiles/history/view/history_view_sublist_section.h
index eff71d50cf1de..6379c98453233 100644
--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_sublist_section.h
@@ -136,6 +136,7 @@ class SublistWidget final
 		Painter &p,
 		const Ui::ChatPaintContext &context) override;
 	QString listElementAuthorRank(not_null<const Element*> view) override;
+	bool listElementHideTopicButton(not_null<const Element*> view) override;
 	History *listTranslateHistory() override;
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index 96c6cb8418d2f..9724bdec2e42a 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -161,6 +161,7 @@ class ShortcutMessages
 		Painter &p,
 		const Ui::ChatPaintContext &context) override;
 	QString listElementAuthorRank(not_null<const Element*> view) override;
+	bool listElementHideTopicButton(not_null<const Element*> view) override;
 	History *listTranslateHistory() override;
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
@@ -1046,6 +1047,11 @@ QString ShortcutMessages::listElementAuthorRank(
 	return {};
 }
 
+bool ShortcutMessages::listElementHideTopicButton(
+		not_null<const Element*> view) {
+	return true;
+}
+
 History *ShortcutMessages::listTranslateHistory() {
 	return nullptr;
 }

From e47e4ba3385d802575ede50afde926185b33a543 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jun 2024 18:08:43 +0400
Subject: [PATCH 367/400] 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 7b48c6a3618c7..9ea83129424a1 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 7b48c6a3618c7953046914ca4c6fe739684644b8
+Subproject commit 9ea83129424a1191ec099ad1eddb77dc8b2c8745
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 66ed73106e018..659b9181240aa 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 66ed73106e0180d8ae92c9c9a272e4a8d76ff336
+Subproject commit 659b9181240aae16c05ef8ab7e6c4dd527afcf8a

From 273119fc552bd31078467be40c3cbd6fce244f90 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jun 2024 18:43:58 +0400
Subject: [PATCH 368/400] Fix preview messages load in migrated groups.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index dddc3669522ec..9bf9739f3c799 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -577,8 +577,12 @@ MessagesBarData Item::listMessagesBar(
 		? _replies->computeInboxReadTillFull()
 		: MsgId();
 	const auto migrated = _replies ? nullptr : _history->migrateFrom();
-	const auto migratedTill = migrated ? migrated->inboxReadTillId() : 0;
-	const auto historyTill = _replies ? 0 : _history->inboxReadTillId();
+	const auto migratedTill = (migrated && migrated->unreadCount() > 0)
+		? migrated->inboxReadTillId()
+		: 0;
+	const auto historyTill = (_replies || !_history->unreadCount())
+		? 0
+		: _history->inboxReadTillId();
 	if (!_replies && !migratedTill && !historyTill) {
 		return {};
 	}

From 7e01b1282585f5783d0bae77a6fa212c8a242a49 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 12 Jun 2024 17:50:30 +0300
Subject: [PATCH 369/400] Replaced credits currency with icon in buttons of
 reply keyboard.

---
 .../history/history_item_components.cpp       | 47 ++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 60c29e7ee465c..dde906494dc66 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -14,6 +14,7 @@ For license and copyright information please follow this link:
 #include "ui/effects/spoiler_mess.h"
 #include "ui/image/image.h"
 #include "ui/toast/toast.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/chat/chat_style.h"
@@ -48,9 +49,11 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 #include "api/api_bot.h"
-#include "styles/style_widgets.h"
+#include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_dialogs.h" // dialogsMiniReplyStory.
+#include "styles/style_settings.h"
+#include "styles/style_widgets.h"
 
 #include <QtGui/QGuiApplication>
 
@@ -679,6 +682,11 @@ ReplyKeyboard::ReplyKeyboard(
 		const auto context = _item->fullId();
 		const auto rowCount = int(markup->data.rows.size());
 		_rows.reserve(rowCount);
+		const auto buttonEmoji = Ui::Text::SingleCustomEmoji(
+			owner->customEmojiManager().registerInternalEmoji(
+				st::settingsPremiumIconStar,
+				QMargins(0, -st::moderateBoxExpandInnerSkip, 0, 0),
+				true));
 		for (auto i = 0; i != rowCount; ++i) {
 			const auto &row = markup->data.rows[i];
 			const auto rowSize = int(row.size());
@@ -686,17 +694,44 @@ ReplyKeyboard::ReplyKeyboard(
 			newRow.reserve(rowSize);
 			for (auto j = 0; j != rowSize; ++j) {
 				auto button = Button();
-				const auto text = row[j].text;
+				const auto text = base::duplicate(row[j].text).replace(
+					Ui::kCreditsCurrency,
+					QChar(0x2B50));
+				const auto textWithEntities = [&] {
+					auto result = TextWithEntities();
+					auto firstPart = true;
+					for (const auto &part : text.split(QChar(0x2B50))) {
+						if (!firstPart) {
+							result.append(buttonEmoji);
+						}
+						result.append(part);
+						firstPart = false;
+					}
+					return result.entities.empty()
+						? TextWithEntities()
+						: result;
+				}();
 				button.type = row.at(j).type;
 				button.link = std::make_shared<ReplyMarkupClickHandler>(
 					owner,
 					i,
 					j,
 					context);
-				button.text.setText(
-					_st->textStyle(),
-					TextUtilities::SingleLine(text),
-					kPlainTextOptions);
+				if (!textWithEntities.text.isEmpty()) {
+					button.text.setMarkedText(
+						_st->textStyle(),
+						TextUtilities::SingleLine(textWithEntities),
+						kMarkupTextOptions,
+						Core::MarkedTextContext{
+							.session = &item->history()->owner().session(),
+							.customEmojiRepaint = [=] { _st->repaint(item); },
+						});
+				} else {
+					button.text.setText(
+						_st->textStyle(),
+						TextUtilities::SingleLine(text),
+						kPlainTextOptions);
+				}
 				button.characters = text.isEmpty() ? 1 : text.size();
 				newRow.push_back(std::move(button));
 			}

From 06075411a5f4712eee21b4e1f8cf7a97f836ff33 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 13 Jun 2024 16:16:31 +0300
Subject: [PATCH 370/400] Fixed cases when list of top-up credit options is
 empty.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.h               | 2 +-
 Telegram/SourceFiles/settings/settings_credits_graphics.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 9a1e736d990b8..581bfdc002abc 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -264,7 +264,7 @@ class Widget final : public Window::AbstractSectionWidget {
 		bool forceFullCancel = false;
 		bool jumpBackToSearchedChat = false;
 	};
-	bool cancelSearch(CancelSearchOptions options = {});
+	bool cancelSearch(CancelSearchOptions options);
 
 	MTP::Sender _api;
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index c42b611e97d5c..91a8c1625bb3a 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -165,7 +165,7 @@ QImage GenerateStars(int height, int count) {
 void FillCreditOptions(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container,
-		int minCredits,
+		int minimumCredits,
 		Fn<void()> paid) {
 	const auto options = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -191,6 +191,10 @@ void FillCreditOptions(
 			- st.iconLeft
 			- singleStarWidth;
 		const auto buttonHeight = st.height + rect::m::sum::v(st.padding);
+		const auto minCredits = (!options.empty()
+				&& (minimumCredits > options.back().credits))
+			? 0
+			: minimumCredits;
 		for (auto i = 0; i < options.size(); i++) {
 			const auto &option = options[i];
 			if (option.credits < minCredits) {

From 10f7b985c76fe0b0d245110fdd239b457e3978d2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 13 Jun 2024 16:20:04 +0300
Subject: [PATCH 371/400] Added decimal separators to count of members in
 shared similar channels.

---
 .../info/similar_channels/info_similar_channels_widget.cpp   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/similar_channels/info_similar_channels_widget.cpp b/Telegram/SourceFiles/info/similar_channels/info_similar_channels_widget.cpp
index cfc911aaf9c11..ae77ec2e295b2 100644
--- a/Telegram/SourceFiles/info/similar_channels/info_similar_channels_widget.cpp
+++ b/Telegram/SourceFiles/info/similar_channels/info_similar_channels_widget.cpp
@@ -85,7 +85,10 @@ std::unique_ptr<PeerListRow> ListController::createRow(
 	if (const auto channel = peer->asChannel()) {
 		if (const auto count = channel->membersCount(); count > 1) {
 			result->setCustomStatus(
-				tr::lng_chat_status_subscribers(tr::now, lt_count, count));
+				tr::lng_chat_status_subscribers(
+					tr::now,
+					lt_count_decimal,
+					count));
 		}
 	}
 	return result;

From 82428aef28dbe9644ea5a00983f722fe70f418cd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 13 Jun 2024 17:19:24 +0300
Subject: [PATCH 372/400] Added support for quoted-printable encoding to
 contact media.

---
 .../SourceFiles/data/data_media_types.cpp     | 86 +++++++++++++++++++
 Telegram/SourceFiles/data/data_media_types.h  |  2 +
 Telegram/SourceFiles/history/history_item.cpp | 48 +----------
 3 files changed, 89 insertions(+), 47 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index feb8ad16dc037..4594b7fa2338b 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -1219,6 +1219,92 @@ std::unique_ptr<HistoryView::Media> MediaFile::createView(
 		_document);
 }
 
+SharedContact::VcardItems SharedContact::ParseVcard(const QString &data) {
+	const auto decode = [&](const QByteArray &input) -> QString {
+		auto output = QByteArray();
+		for (auto i = 0; i < input.size(); ++i) {
+			if ((input.at(i) == '=') && ((i + 2) < input.size())) {
+				const auto value = input.mid((++i)++, 2);
+				auto converted = false;
+				const auto character = char(value.toUInt(&converted, 16));
+				if (converted) {
+					output.append(character);
+				} else {
+					output.append('=');
+					output.append(value);
+				}
+			} else {
+				output.append(input.at(i));
+			}
+		}
+
+		return QString::fromUtf8(output);
+	};
+
+	using Type = SharedContact::VcardItemType;
+	auto items = SharedContact::VcardItems();
+	for (const auto &item : data.split('\n')) {
+		const auto parts = item.split(':');
+		if (parts.size() == 2) {
+			const auto &type = parts.front();
+			const auto attributes = type.split(';', Qt::SkipEmptyParts);
+
+			const auto c = Qt::CaseInsensitive;
+			auto isQuotedPrintable = false;
+			for (const auto &attribute : attributes) {
+				const auto parts = attribute.split('=', Qt::SkipEmptyParts);
+				if (parts.size() == 2) {
+					if (parts.front().startsWith("ENCODING", c)) {
+						isQuotedPrintable = parts[1].startsWith(
+							"QUOTED-PRINTABLE",
+							c);
+						break;
+					}
+				}
+			}
+
+			const auto &value = isQuotedPrintable
+				? decode(parts[1].toUtf8())
+				: parts[1];
+
+			if (type.startsWith("TEL")) {
+				const auto telType = type.contains("PREF")
+					? Type::PhoneMain
+					: type.contains("HOME")
+					? Type::PhoneHome
+					: type.contains("WORK")
+					? Type::PhoneWork
+					: (type.contains("CELL")
+						|| type.contains("MOBILE"))
+					? Type::PhoneMobile
+					: type.contains("OTHER")
+					? Type::PhoneOther
+					: Type::Phone;
+				items[telType] = value;
+			} else if (type.startsWith("EMAIL")) {
+				items[Type::Email] = value;
+			} else if (type.startsWith("URL")) {
+				items[Type::Url] = value;
+			} else if (type.startsWith("NOTE")) {
+				items[Type::Note] = value;
+			} else if (type.startsWith("ORG")) {
+				items[Type::Organization] = base::duplicate(value)
+					.replace(';', ' ')
+					.trimmed();
+			} else if (type.startsWith("ADR")) {
+				items[Type::Address] = value;
+			} else if (type.startsWith("BDAY")) {
+				items[Type::Birthday] = value;
+			} else if (type.startsWith("N")) {
+				items[Type::Name] = base::duplicate(value)
+					.replace(';', ' ')
+					.trimmed();
+			}
+		}
+	}
+	return items;
+}
+
 MediaContact::MediaContact(
 	not_null<HistoryItem*> parent,
 	UserId userId,
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index d9f0773c02730..08d1320b9ca2f 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -70,6 +70,8 @@ struct SharedContact final {
 	};
 
 	using VcardItems = base::flat_map<VcardItemType, QString>;
+	static VcardItems ParseVcard(const QString &);
+
 	VcardItems vcardItems;
 };
 
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 73b92e21d51a0..73e0662c03d6f 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -211,59 +211,13 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 		const MTPMessageMedia &media) {
 	using Result = std::unique_ptr<Data::Media>;
 	return media.match([&](const MTPDmessageMediaContact &media) -> Result {
-
-		const auto vcardItems = [&] {
-			using Type = Data::SharedContact::VcardItemType;
-			auto items = Data::SharedContact::VcardItems();
-			for (const auto &item : qs(media.vvcard()).split('\n')) {
-				const auto parts = item.split(':');
-				if (parts.size() == 2) {
-					const auto &type = parts.front();
-					const auto &value = parts[1];
-
-					if (type.startsWith("TEL")) {
-						const auto telType = type.contains("PREF")
-							? Type::PhoneMain
-							: type.contains("HOME")
-							? Type::PhoneHome
-							: type.contains("WORK")
-							? Type::PhoneWork
-							: (type.contains("CELL")
-								|| type.contains("MOBILE"))
-							? Type::PhoneMobile
-							: type.contains("OTHER")
-							? Type::PhoneOther
-							: Type::Phone;
-						items[telType] = value;
-					} else if (type.startsWith("EMAIL")) {
-						items[Type::Email] = value;
-					} else if (type.startsWith("URL")) {
-						items[Type::Url] = value;
-					} else if (type.startsWith("NOTE")) {
-						items[Type::Note] = value;
-					} else if (type.startsWith("ORG")) {
-						items[Type::Organization] = value;
-						items[Type::Organization].replace(';', ' ');
-					} else if (type.startsWith("ADR")) {
-						items[Type::Address] = value;
-					} else if (type.startsWith("BDAY")) {
-						items[Type::Birthday] = value;
-					} else if (type.startsWith("N")) {
-						items[Type::Name] = value;
-						items[Type::Name].replace(';', ' ');
-					}
-				}
-			}
-			return items;
-		}();
-
 		return std::make_unique<Data::MediaContact>(
 			item,
 			media.vuser_id().v,
 			qs(media.vfirst_name()),
 			qs(media.vlast_name()),
 			qs(media.vphone_number()),
-			vcardItems);
+			Data::SharedContact::ParseVcard(qs(media.vvcard())));
 	}, [&](const MTPDmessageMediaGeo &media) -> Result {
 		return media.vgeo().match([&](const MTPDgeoPoint &point) -> Result {
 			return std::make_unique<Data::MediaLocation>(

From a1d8202644379e1da80886084f7ef644ded3671d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jun 2024 18:48:35 +0400
Subject: [PATCH 373/400] Version 5.1.6.

- Fix search in archived chats in single-column layout.
- Improve chat previews for topics, Saved Messages and groups.
- Fix formatting shortcuts on Linux.
- Fix options for Telegram Stars buying in case of large amounts.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 7 +++++++
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 68f8a47f7147a..156ba80157b94 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.1.5.0" />
+    Version="5.1.6.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index d9a60a870f757..e99716955a4ae 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,1,5,0
- PRODUCTVERSION 5,1,5,0
+ FILEVERSION 5,1,6,0
+ PRODUCTVERSION 5,1,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.1.5.0"
+            VALUE "FileVersion", "5.1.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.5.0"
+            VALUE "ProductVersion", "5.1.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index afbc675ba79f7..df113e77320f4 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,1,5,0
- PRODUCTVERSION 5,1,5,0
+ FILEVERSION 5,1,6,0
+ PRODUCTVERSION 5,1,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.1.5.0"
+            VALUE "FileVersion", "5.1.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.5.0"
+            VALUE "ProductVersion", "5.1.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index aac395fa23f0f..4a4e5c4740851 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 = 5001005;
-constexpr auto AppVersionStr = "5.1.5";
+constexpr auto AppVersion = 5001006;
+constexpr auto AppVersionStr = "5.1.6";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index e382b01adc064..dc36a68e6e135 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5001005
+AppVersion         5001006
 AppVersionStrMajor 5.1
-AppVersionStrSmall 5.1.5
-AppVersionStr      5.1.5
+AppVersionStrSmall 5.1.6
+AppVersionStr      5.1.6
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.1.5
+AppVersionOriginal 5.1.6
diff --git a/changelog.txt b/changelog.txt
index c91e229ac02c3..660a648336f9e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+5.1.6 (13.06.24)
+
+- Fix search in archived chats in single-column layout.
+- Improve chat previews for topics, Saved Messages and groups.
+- Fix formatting shortcuts on Linux.
+- Fix options for Telegram Stars buying in case of large amounts.
+
 5.1.5 (07.06.24)
 
 - Return WebView on Windows.

From c49eb7041fb48bbbb9e379518741585c3678a7be Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jun 2024 20:55:49 +0400
Subject: [PATCH 374/400] Version 5.1.6: Fix sticker effect filtering.

---
 .../view/reactions/history_view_reactions_selector.cpp    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index 11ba8209435f2..f884fe28569e7 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -1116,7 +1116,13 @@ void Selector::createList() {
 		_list->searchQueries(
 		) | rpl::start_with_next([=](std::vector<QString> &&query) {
 			_stickers->applySearchQuery(std::move(query));
-			updateVisibleTopBottom();
+		}, _stickers->lifetime());
+
+		rpl::combine(
+			_list->heightValue(),
+			_stickers->heightValue()
+		) | rpl::start_with_next([=] {
+			InvokeQueued(lists, updateVisibleTopBottom);
 		}, _stickers->lifetime());
 
 		rpl::combine(

From 3f216ad9462264380e65a01db8b4ac3b7c684f0f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 13 Jun 2024 19:26:07 +0400
Subject: [PATCH 375/400] Enable parallelism for more dependencies

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

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index c4a1e64bb04e9..a705fa84388b5 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -107,7 +107,7 @@ def nativeToolsError():
 elif (mac):
     environment.update({
         'SPECIAL_TARGET': 'mac',
-        'MAKE_THREADS_CNT': '-j8',
+        'MAKE_THREADS_CNT': '-j' + str(os.cpu_count()),
         'MACOSX_DEPLOYMENT_TARGET': '10.13',
         'UNGUARDED': '-Werror=unguarded-availability-new',
         'MIN_VER': '-mmacosx-version-min=10.13',
@@ -435,7 +435,7 @@ def runStages():
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 25f76cf4d5
+    git checkout c237d12bcd
 """)
 
 stage('msys64', """
@@ -511,9 +511,9 @@ def runStages():
 win:
     git clone https://github.com/desktop-app/lzma.git
     cd lzma\\C\\Util\\LzmaLib
-    msbuild LzmaLib.sln /property:Configuration=Debug /property:Platform="$X8664"
+    msbuild -m LzmaLib.sln /property:Configuration=Debug /property:Platform="$X8664"
 release:
-    msbuild LzmaLib.sln /property:Configuration=Release /property:Platform="$X8664"
+    msbuild -m LzmaLib.sln /property:Configuration=Release /property:Platform="$X8664"
 """)
 
 stage('xz', """
@@ -540,9 +540,9 @@ def runStages():
         -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
         -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
         -DCMAKE_C_FLAGS="/DZLIB_WINAPI"
-    cmake --build . --config Debug
+    cmake --build . --config Debug --parallel
 release:
-    cmake --build . --config Release
+    cmake --build . --config Release --parallel
 mac:
     CFLAGS="$MIN_VER $UNGUARDED" LDFLAGS="$MIN_VER" ./configure \\
         --static \\
@@ -560,9 +560,9 @@ def runStages():
         -A %WIN32X64% ^
         -DWITH_JPEG8=ON ^
         -DPNG_SUPPORTED=OFF
-    cmake --build . --config Debug
+    cmake --build . --config Debug --parallel
 release:
-    cmake --build . --config Release
+    cmake --build . --config Release --parallel
 mac:
     CFLAGS="-arch arm64" cmake -B build.arm64 . \\
         -D CMAKE_SYSTEM_NAME=Darwin \\
@@ -643,8 +643,8 @@ def runStages():
         -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
         -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
         -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"
-    cmake --build out --config Debug
-    cmake --build out --config Release
+    cmake --build out --config Debug --parallel
+    cmake --build out --config Release --parallel
     cmake --install out --config Release
 mac:
     CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake -B build . \\
@@ -663,9 +663,9 @@ def runStages():
     cd out
 win:
     cmake -A %WIN32X64% ..
-    cmake --build . --config Debug
+    cmake --build . --config Debug --parallel
 release:
-    cmake --build . --config Release
+    cmake --build . --config Release --parallel
 !win:
     mkdir Debug
     cd Debug
@@ -780,10 +780,10 @@ def runStages():
         -DBUILD_SHARED_LIBS=OFF ^
         -DAVIF_ENABLE_WERROR=OFF ^
         -DAVIF_CODEC_DAV1D=ON
-    cmake --build . --config Debug
+    cmake --build . --config Debug --parallel
     cmake --install . --config Debug
 release:
-    cmake --build . --config Release
+    cmake --build . --config Release --parallel
     cmake --install . --config Release
 mac:
     cmake . \\
@@ -816,10 +816,10 @@ def runStages():
         -DBUILD_SHARED_LIBS=OFF ^
         -DENABLE_DECODER=OFF ^
         -DENABLE_ENCODER=OFF
-    cmake --build . --config Debug
+    cmake --build . --config Debug --parallel
     cmake --install . --config Debug
 release:
-    cmake --build . --config Release
+    cmake --build . --config Release --parallel
     cmake --install . --config Release
 mac:
     cmake . \\
@@ -898,10 +898,10 @@ def runStages():
         -DWITH_RAV1E=OFF ^
         -DWITH_RAV1E_PLUGIN=OFF ^
         -DWITH_EXAMPLES=OFF
-    cmake --build . --config Debug
+    cmake --build . --config Debug --parallel
     cmake --install . --config Debug
 release:
-    cmake --build . --config Release
+    cmake --build . --config Release --parallel
     cmake --install . --config Release
 mac:
     cmake . \\
@@ -964,10 +964,10 @@ def runStages():
         -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
         -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
         %cmake_defines%
-    cmake --build . --config Debug
+    cmake --build . --config Debug --parallel
     cmake --install . --config Debug
 release:
-    cmake --build . --config Release
+    cmake --build . --config Release --parallel
     cmake --install . --config Release
 mac:
     cmake . \\
@@ -1322,7 +1322,7 @@ def runStages():
     ninja -C out/Release%FolderPostfix% common crash_generation_client exception_handler
     cd tools\\windows\\dump_syms
     gyp dump_syms.gyp --format=msvs
-    msbuild dump_syms.vcxproj /property:Configuration=Release /property:Platform="x64"
+    msbuild -m dump_syms.vcxproj /property:Configuration=Release /property:Platform="x64"
 win:
     deactivate
 mac:

From 6f6fb3d1b66c0023bec284bb77718ec07cf9df93 Mon Sep 17 00:00:00 2001
From: pandaninjas <admin@malwarefight.wip.la>
Date: Thu, 13 Jun 2024 19:00:04 -0700
Subject: [PATCH 376/400] Add xlsb to list of executable extensions

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

diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index cc1c14c845d3c..5e15fd4e3df0e 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -285,7 +285,7 @@ pod prf prg ps1 ps2 ps1xml ps2xml psc1 psc2 psd1 psm1 pssc pst py py3 pyc \
 pyd pyi pyo pyw pyzw pyz rb reg rgs scf scr sct search-ms settingcontent-ms \
 sh shb shs slk sys swf t tmp u3p url vb vbe vbp vbs vbscript vdx vsmacros \
 vsd vsdm vsdx vss vssm vssx vst vstm vstx vsw vsx vtx website wlua ws wsc \
-wsf wsh xbap xll xlsm xnk xs"_q
+wsf wsh xbap xll xlsb xlsm xnk xs"_q
 #elif defined Q_OS_MAC // Q_OS_MAC
 		u"\
 applescript action app bin command csh osx workflow terminal url caction \

From bb33d0b997d0180a4f8f50a3cd52739266ce6e54 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 14 Jun 2024 15:32:02 +0300
Subject: [PATCH 377/400] Replaced credits currency with icon only in buttons
 with Buy type.

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

diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index dde906494dc66..fd4ff16059714 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -694,10 +694,20 @@ ReplyKeyboard::ReplyKeyboard(
 			newRow.reserve(rowSize);
 			for (auto j = 0; j != rowSize; ++j) {
 				auto button = Button();
-				const auto text = base::duplicate(row[j].text).replace(
-					Ui::kCreditsCurrency,
-					QChar(0x2B50));
+				using Type = HistoryMessageMarkupButton::Type;
+				const auto isBuy = (row[j].type == Type::Buy);
+				static const auto RegExp = QRegularExpression("\\b"
+					+ Ui::kCreditsCurrency
+					+ "\\b");
+				const auto text = isBuy
+					? base::duplicate(row[j].text).replace(
+						RegExp,
+						QChar(0x2B50))
+					: row[j].text;
 				const auto textWithEntities = [&] {
+					if (!isBuy) {
+						return TextWithEntities();
+					}
 					auto result = TextWithEntities();
 					auto firstPart = true;
 					for (const auto &part : text.split(QChar(0x2B50))) {

From 174b627a786d66369c56bcd5218dfc3143f4dde6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jun 2024 17:39:16 +0400
Subject: [PATCH 378/400] Fix markdown shortcuts on macOS / some Linux.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 9ea83129424a1..913c39ac3e17d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 9ea83129424a1191ec099ad1eddb77dc8b2c8745
+Subproject commit 913c39ac3e17df6d3be914306f20818b62321d71

From 053c462dc0093075c945c2f21432886c3e12fccf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jun 2024 18:27:39 +0400
Subject: [PATCH 379/400] Fix recent hashtags in chats search.

---
 .../dialogs/dialogs_inner_widget.cpp          | 113 ++++++++----------
 .../dialogs/dialogs_inner_widget.h            |   2 +-
 2 files changed, 49 insertions(+), 66 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 2614a334117e6..b18471d0e5d97 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -512,8 +512,12 @@ int InnerWidget::pinnedOffset() const {
 	return dialogsOffset() + shownHeight(fixedOnTopCount());
 }
 
+int InnerWidget::hashtagsOffset() const {
+	return searchInChatOffset() + searchInChatSkip();
+}
+
 int InnerWidget::filteredOffset() const {
-	return _hashtagResults.size() * st::mentionHeight;
+	return hashtagsOffset() + (_hashtagResults.size() * st::mentionHeight);
 }
 
 int InnerWidget::filteredIndex(int y) const {
@@ -539,29 +543,23 @@ int InnerWidget::peerSearchOffset() const {
 		+ st::searchedBarHeight;
 }
 
-int InnerWidget::searchTagsOffset() const {
-	auto result = peerSearchOffset() - st::searchedBarHeight;
-	if (!_peerSearchResults.empty()) {
-		result += (_peerSearchResults.size() * st::dialogsRowHeight)
-			+ st::searchedBarHeight;
-	}
-	return result;
-}
-
 int InnerWidget::searchInChatOffset() const {
-	return searchTagsOffset() + (_searchTags ? _searchTags->height() : 0);
-}
-
-int InnerWidget::searchedOffset() const {
-	return searchInChatOffset()
-		+ searchInChatSkip()
-		+ st::searchedBarHeight;
+	return (_searchTags ? _searchTags->height() : 0);
 }
 
 int InnerWidget::searchInChatSkip() const {
 	return _searchIn ? _searchIn->height() : 0;
 }
 
+int InnerWidget::searchedOffset() const {
+	auto result = peerSearchOffset();
+	if (!_peerSearchResults.empty()) {
+		result += (_peerSearchResults.size() * st::dialogsRowHeight)
+			+ st::searchedBarHeight;
+	}
+	return result;
+}
+
 void InnerWidget::changeOpenedFolder(Data::Folder *folder) {
 	Expects(!folder || !_savedSublists);
 
@@ -796,10 +794,26 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			p.fillRect(dialogsClip, currentBg());
 		}
 	} else if (_state == WidgetState::Filtered) {
-		[[maybe_unused]] auto top = 0;
+		if (_searchTags) {
+			paintSearchTags(p, {
+				.st = &st::forumTopicRow,
+				.currentBg = currentBg(),
+				.now = ms,
+				.width = fullWidth,
+				.paused = videoPaused,
+			});
+			p.translate(0, _searchTags->height());
+		}
+		if (_searchIn) {
+			p.translate(0, searchInChatSkip());
+			if (_searchResults.empty()) {
+				p.fillRect(0, 0, fullWidth, st::lineWidth, st::shadowFg);
+			}
+		}
 		if (!_hashtagResults.empty()) {
-			auto from = floorclamp(r.y(), st::mentionHeight, 0, _hashtagResults.size());
-			auto to = ceilclamp(r.y() + r.height(), st::mentionHeight, 0, _hashtagResults.size());
+			const auto skip = hashtagsOffset();
+			auto from = floorclamp(r.y() - skip, st::mentionHeight, 0, _hashtagResults.size());
+			auto to = ceilclamp(r.y() + r.height() - skip, st::mentionHeight, 0, _hashtagResults.size());
 			p.translate(0, from * st::mentionHeight);
 			if (from < _hashtagResults.size()) {
 				const auto htagleft = st::defaultDialogRow.padding.left();
@@ -841,7 +855,9 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 						p.drawText(htagleft + firstwidth, st::mentionTop + st::mentionFont->ascent, second);
 					}
 					p.translate(0, st::mentionHeight);
-					top += st::mentionHeight;
+				}
+				if (to < _hashtagResults.size()) {
+					p.translate(0, (_hashtagResults.size() - to) * st::mentionHeight);
 				}
 			}
 		}
@@ -853,7 +869,6 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 				int(_filterResults.size()));
 			const auto height = filteredHeight(from);
 			p.translate(0, height);
-			top += height;
 			for (; from < to; ++from) {
 				const auto selected = isPressed()
 					? (from == _filteredPressed)
@@ -861,7 +876,6 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 				const auto row = _filterResults[from].row;
 				paintRow(row, selected, !activeEntry.fullId);
 				p.translate(0, row->height());
-				top += row->height();
 			}
 		}
 
@@ -871,13 +885,11 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			p.setPen(st::searchedBarFg);
 			p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), tr::lng_search_global_results(tr::now));
 			p.translate(0, st::searchedBarHeight);
-			top += st::searchedBarHeight;
 
 			auto skip = peerSearchOffset();
 			auto from = floorclamp(r.y() - skip, st::dialogsRowHeight, 0, _peerSearchResults.size());
 			auto to = ceilclamp(r.y() + r.height() - skip, st::dialogsRowHeight, 0, _peerSearchResults.size());
 			p.translate(0, from * st::dialogsRowHeight);
-			top += from * st::dialogsRowHeight;
 			if (from < _peerSearchResults.size()) {
 				const auto activePeer = activeEntry.key.peer();
 				for (; from < to; ++from) {
@@ -900,34 +912,10 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 						.paused = videoPaused,
 					});
 					p.translate(0, st::dialogsRowHeight);
-					top += st::dialogsRowHeight;
 				}
-			}
-		}
-
-		if (_searchTags) {
-			paintSearchTags(p, {
-				.st = &st::forumTopicRow,
-				.currentBg = currentBg(),
-				.now = ms,
-				.width = fullWidth,
-				.paused = videoPaused,
-			});
-			p.translate(0, _searchTags->height());
-			top += _searchTags->height();
-		}
-		if (_searchIn) {
-			//paintSearchInChat(p, {
-			//	.st = &st::forumTopicRow,
-			//	.currentBg = currentBg(),
-			//	.now = ms,
-			//	.width = fullWidth,
-			//	.paused = videoPaused,
-			//});
-			p.translate(0, searchInChatSkip());
-			top += searchInChatSkip();
-			if (_searchResults.empty()) {
-				p.fillRect(0, 0, fullWidth, st::lineWidth, st::shadowFg);
+				if (to < _peerSearchResults.size()) {
+					p.translate(0, (_peerSearchResults.size() - to) * st::dialogsRowHeight);
+				}
 			}
 		}
 
@@ -940,7 +928,6 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 				p.setPen(st::searchedBarFg);
 				p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), text);
 				p.translate(0, st::searchedBarHeight);
-				top += st::searchedBarHeight;
 			}
 		} else {
 			const auto text = showUnreadInSearchResults
@@ -954,13 +941,11 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			p.setPen(st::searchedBarFg);
 			p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), text);
 			p.translate(0, st::searchedBarHeight);
-			top += st::searchedBarHeight;
 
 			auto skip = searchedOffset();
 			auto from = floorclamp(r.y() - skip, _st->height, 0, _searchResults.size());
 			auto to = ceilclamp(r.y() + r.height() - skip, _st->height, 0, _searchResults.size());
 			p.translate(0, from * _st->height);
-			top += from * _st->height;
 			if (from < _searchResults.size()) {
 				for (; from < to; ++from) {
 					const auto &result = _searchResults[from];
@@ -988,7 +973,6 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 						.displayUnreadInfo = showUnreadInSearchResults,
 					});
 					p.translate(0, _st->height);
-					top += _st->height;
 				}
 			}
 		}
@@ -1363,7 +1347,7 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 
 	const auto tagBase = QPoint(
 		_searchTagsLeft,
-		searchTagsOffset() + st::dialogsSearchTagBottom / 2);
+		st::dialogsSearchTagBottom / 2);
 	const auto tagPoint = local - tagBase;
 	const auto inTags = _searchTags
 		&& QRect(
@@ -1414,7 +1398,7 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 			_hashtagSelected = -1;
 			_hashtagDeleteSelected = false;
 		} else {
-			auto skip = 0;
+			auto skip = hashtagsOffset();
 			auto hashtagSelected = (mouseY >= skip) ? ((mouseY - skip) / st::mentionHeight) : -1;
 			if (hashtagSelected < 0 || hashtagSelected >= _hashtagResults.size()) {
 				hashtagSelected = -1;
@@ -1547,8 +1531,9 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 		_dragStart = e->pos();
 	} else if (base::in_range(_hashtagPressed, 0, _hashtagResults.size()) && !_hashtagDeletePressed) {
 		auto row = &_hashtagResults[_hashtagPressed]->row;
-		row->addRipple(e->pos(), QSize(width(), st::mentionHeight), [this, index = _hashtagPressed] {
-			update(0, index * st::mentionHeight, width(), st::mentionHeight);
+		const auto origin = e->pos() - QPoint(0, hashtagsOffset() + _hashtagPressed * st::mentionHeight);
+		row->addRipple(origin, QSize(width(), st::mentionHeight), [this, index = _hashtagPressed] {
+			update(0, hashtagsOffset() + index * st::mentionHeight, width(), st::mentionHeight);
 		});
 	} else if (base::in_range(_filteredPressed, 0, _filterResults.size())) {
 		const auto &result = _filterResults[_filteredPressed];
@@ -1989,9 +1974,7 @@ void InnerWidget::moveSearchIn() {
 		width(),
 		st::columnMinimalWidthLeft - _narrowWidth);
 	_searchIn->resizeToWidth(searchInWidth);
-
-	const auto top = (_searchTags ? _searchTags->height() : 0);
-	_searchIn->moveToLeft(0, top);
+	_searchIn->moveToLeft(0, searchInChatOffset());
 }
 
 void InnerWidget::dialogRowReplaced(
@@ -2318,7 +2301,7 @@ void InnerWidget::updateSelectedRow(Key key) {
 				}
 			}
 		} else if (_hashtagSelected >= 0) {
-			update(0, _hashtagSelected * st::mentionHeight, width(), st::mentionHeight);
+			update(0, hashtagsOffset() + _hashtagSelected * st::mentionHeight, width(), st::mentionHeight);
 		} else if (_filteredSelected >= 0) {
 			if (_filteredSelected < _filterResults.size()) {
 				const auto &result = _filterResults[_filteredSelected];
@@ -2631,7 +2614,7 @@ void InnerWidget::applySearchState(SearchState state) {
 
 		_searchTags->repaintRequests() | rpl::start_with_next([=] {
 			const auto height = _searchTags->height();
-			update(0, searchTagsOffset(), width(), height);
+			update(0, 0, width(), height);
 		}, _searchTags->lifetime());
 
 		_searchTags->menuRequests(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 9d74bf8cb0758..ebb22aa8278ae 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -343,10 +343,10 @@ class InnerWidget final : public Ui::RpWidget {
 	[[nodiscard]] int filteredIndex(int y) const;
 	[[nodiscard]] int filteredHeight(int till = -1) const;
 	[[nodiscard]] int peerSearchOffset() const;
-	[[nodiscard]] int searchTagsOffset() const;
 	[[nodiscard]] int searchInChatOffset() const;
 	[[nodiscard]] int searchedOffset() const;
 	[[nodiscard]] int searchInChatSkip() const;
+	[[nodiscard]] int hashtagsOffset() const;
 
 	void paintCollapsedRows(
 		Painter &p,

From 43ffc9d67c6a5c9c408ee49212c4d917f8468101 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jun 2024 18:36:28 +0400
Subject: [PATCH 380/400] Version 5.1.7.

- Fix recently searched hashtags in chats search.
- Fix formatting shortcuts on macOS.
- Fix non-Telegram-Stars-invoice bot buttons with star emoji.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 6 ++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 156ba80157b94..fed726359bba3 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.1.6.0" />
+    Version="5.1.7.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index e99716955a4ae..fb620ebceab8f 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,1,6,0
- PRODUCTVERSION 5,1,6,0
+ FILEVERSION 5,1,7,0
+ PRODUCTVERSION 5,1,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.1.6.0"
+            VALUE "FileVersion", "5.1.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.6.0"
+            VALUE "ProductVersion", "5.1.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index df113e77320f4..7f599ef595fc2 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,1,6,0
- PRODUCTVERSION 5,1,6,0
+ FILEVERSION 5,1,7,0
+ PRODUCTVERSION 5,1,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.1.6.0"
+            VALUE "FileVersion", "5.1.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.6.0"
+            VALUE "ProductVersion", "5.1.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 4a4e5c4740851..960408a6517c2 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 = 5001006;
-constexpr auto AppVersionStr = "5.1.6";
+constexpr auto AppVersion = 5001007;
+constexpr auto AppVersionStr = "5.1.7";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index dc36a68e6e135..6f0f009fbea3a 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5001006
+AppVersion         5001007
 AppVersionStrMajor 5.1
-AppVersionStrSmall 5.1.6
-AppVersionStr      5.1.6
+AppVersionStrSmall 5.1.7
+AppVersionStr      5.1.7
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.1.6
+AppVersionOriginal 5.1.7
diff --git a/changelog.txt b/changelog.txt
index 660a648336f9e..5eb0f2e7e82c2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+5.1.7 (14.06.24)
+
+- Fix recently searched hashtags in chats search.
+- Fix formatting shortcuts on macOS.
+- Fix non-Telegram-Stars-invoice bot buttons with star emoji.
+
 5.1.6 (13.06.24)
 
 - Fix search in archived chats in single-column layout.

From 99e88d74bc579076dab340780a27f8bf4060d057 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jun 2024 19:06:08 +0400
Subject: [PATCH 381/400] Version 5.1.7: Fix build with Qt 6.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 913c39ac3e17d..e9fb40c0d3ef6 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 913c39ac3e17df6d3be914306f20818b62321d71
+Subproject commit e9fb40c0d3ef6f05bfef0f4395c8b2d81bc9823a

From 2673e1df5368ba9f5988ca2857bad5fbfee7d68c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 5 Jun 2024 18:29:16 +0400
Subject: [PATCH 382/400] Fix IV window on Linux

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

diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index cc9d727fed4fc..3b30dc6dbbf65 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -221,7 +221,7 @@ Controller::~Controller() {
 void Controller::updateTitleGeometry(int newWidth) const {
 	_subtitleWrap->setGeometry(
 		0,
-		st::windowTitleHeight,
+		0,
 		newWidth,
 		st::ivSubtitleHeight);
 	_subtitleWrap->paintRequest() | rpl::start_with_next([=](QRect clip) {
@@ -241,7 +241,7 @@ void Controller::updateTitleGeometry(int newWidth) const {
 }
 
 void Controller::initControls() {
-	_subtitleWrap = std::make_unique<Ui::RpWidget>(_window.get());
+	_subtitleWrap = std::make_unique<Ui::RpWidget>(_window->body().get());
 	_subtitleText = _index.value() | rpl::filter(
 		rpl::mappers::_1 >= 0
 	) | rpl::map([=](int index) {
@@ -275,7 +275,7 @@ void Controller::initControls() {
 	_back->toggledValue(
 	) | rpl::start_with_next([=](bool toggled) {
 		_subtitleLeft.start(
-			[=] { updateTitleGeometry(_window->width()); },
+			[=] { updateTitleGeometry(_window->body()->width()); },
 			toggled ? 0. : 1.,
 			toggled ? 1. : 0.,
 			st::fadeWrapDuration);
@@ -353,7 +353,7 @@ void Controller::createWindow() {
 
 	initControls();
 
-	window->widthValue() | rpl::start_with_next([=](int width) {
+	window->body()->widthValue() | rpl::start_with_next([=](int width) {
 		updateTitleGeometry(width);
 	}, _subtitle->lifetime());
 
@@ -366,13 +366,13 @@ void Controller::createWindow() {
 		_delegate->ivSaveGeometry(window);
 	}, window->lifetime());
 
-	_container = Ui::CreateChild<Ui::RpWidget>(window->window());
+	_container = Ui::CreateChild<Ui::RpWidget>(window->body().get());
 	rpl::combine(
-		window->sizeValue(),
+		window->body()->sizeValue(),
 		_subtitleWrap->heightValue()
 	) | rpl::start_with_next([=](QSize size, int title) {
 		_container->setGeometry(QRect(QPoint(), size).marginsRemoved(
-			{ 0, title + st::windowTitleHeight, 0, 0 }));
+			{ 0, title, 0, 0 }));
 	}, _container->lifetime());
 
 	_container->paintRequest() | rpl::start_with_next([=](QRect clip) {
@@ -807,11 +807,10 @@ void Controller::showShareMenu() {
 	}
 
 	_shareWrap = std::make_unique<Ui::RpWidget>(_shareHidesContent
-		? _window->window()
+		? _window->body().get()
 		: nullptr);
-	const auto margins = QMargins(0, st::windowTitleHeight, 0, 0);
 	if (!_shareHidesContent) {
-		_shareWrap->setGeometry(_window->geometry().marginsRemoved(margins));
+		_shareWrap->setGeometry(_window->body()->rect());
 		_shareWrap->setWindowFlag(Qt::FramelessWindowHint);
 		_shareWrap->setAttribute(Qt::WA_TranslucentBackground);
 		_shareWrap->setAttribute(Qt::WA_NoSystemBackground);
@@ -819,14 +818,14 @@ void Controller::showShareMenu() {
 
 		_shareContainer.reset(QWidget::createWindowContainer(
 			_shareWrap->windowHandle(),
-			_window.get(),
+			_window->body().get(),
 			Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint));
 	}
-	_window->sizeValue() | rpl::start_with_next([=](QSize size) {
+	_window->body()->sizeValue() | rpl::start_with_next([=](QSize size) {
 		const auto widget = _shareHidesContent
 			? _shareWrap.get()
 			: _shareContainer.get();
-		widget->setGeometry(QRect(QPoint(), size).marginsRemoved(margins));
+		widget->setGeometry(QRect(QPoint(), size));
 	}, _shareWrap->lifetime());
 
 	auto result = _showShareBox({

From e4d88f829c3fbc397f5a9255169ab023b12ff8bc Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 28 May 2024 18:19:47 +0400
Subject: [PATCH 383/400] Remove old window activation workaround for X11
 systems

There seem to be no need in it anymore
---
 .../media/view/media_view_overlay_widget.cpp  |  3 ---
 Telegram/SourceFiles/window/main_window.cpp   | 23 -------------------
 Telegram/SourceFiles/window/main_window.h     |  2 --
 .../window/notifications_manager.cpp          |  1 -
 .../SourceFiles/window/window_controller.cpp  |  4 ----
 .../SourceFiles/window/window_controller.h    |  1 -
 6 files changed, 34 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 6d7e8d73b9cae..ecbb7b06fac02 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -2216,9 +2216,6 @@ void OverlayWidget::close() {
 		return;
 	}
 	hide();
-	if (const auto window = Core::App().activeWindow()) {
-		window->reActivate();
-	}
 	_helper->clearState();
 }
 
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 1c5de596762e2..e776b7637244a 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -28,7 +28,6 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "base/options.h"
-#include "base/call_delayed.h"
 #include "base/crc32hash.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/shadow.h"
@@ -951,28 +950,6 @@ bool MainWindow::minimizeToTray() {
 	return true;
 }
 
-void MainWindow::reActivateWindow() {
-	// X11 is the only platform with unreliable activate requests
-	if (!Platform::IsX11()) {
-		return;
-	}
-	const auto weak = Ui::MakeWeak(this);
-	const auto reActivate = [=] {
-		if (const auto w = weak.data()) {
-			if (auto f = QApplication::focusWidget()) {
-				f->clearFocus();
-			}
-			w->activate();
-			if (auto f = QApplication::focusWidget()) {
-				f->clearFocus();
-			}
-			w->setInnerFocus();
-		}
-	};
-	crl::on_main(this, reActivate);
-	base::call_delayed(200, this, reActivate);
-}
-
 void MainWindow::showRightColumn(object_ptr<TWidget> widget) {
 	const auto wasWidth = width();
 	const auto wasRightWidth = _rightColumn ? _rightColumn->width() : 0;
diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h
index 67f38567ca50b..7bbbf8e86bbeb 100644
--- a/Telegram/SourceFiles/window/main_window.h
+++ b/Telegram/SourceFiles/window/main_window.h
@@ -98,8 +98,6 @@ class MainWindow : public Ui::RpWindow {
 	}
 	void positionUpdated();
 
-	void reActivateWindow();
-
 	void showRightColumn(object_ptr<TWidget> widget);
 	int maximalExtendBy() const;
 	bool canExtendNoMove(int extendBy) const;
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 052abca8fa232..460858972eaa4 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -1076,7 +1076,6 @@ void Manager::notificationActivated(
 				history->setLocalDraft(std::move(draft));
 			}
 			window->widget()->showFromTray();
-			window->widget()->reActivateWindow();
 			if (Core::App().passcodeLocked()) {
 				window->widget()->setInnerFocus();
 				system()->clearAll();
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index 19c12c30e9255..abe2fa3dc4ade 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -444,10 +444,6 @@ void Controller::activate() {
 	_widget.activate();
 }
 
-void Controller::reActivate() {
-	_widget.reActivateWindow();
-}
-
 void Controller::updateIsActiveFocus() {
 	_isActiveTimer.callOnce(sessionController()
 		? sessionController()->session().serverConfig().onlineFocusTimeout
diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h
index cd59790065ba5..eadd32e2fd5be 100644
--- a/Telegram/SourceFiles/window/window_controller.h
+++ b/Telegram/SourceFiles/window/window_controller.h
@@ -119,7 +119,6 @@ class Controller final : public base::has_weak_ptr {
 	}
 
 	void activate();
-	void reActivate();
 	void updateIsActiveFocus();
 	void updateIsActiveBlur();
 	void updateIsActive();

From d79da3d884a195cedd9114bf16583d8930d69f30 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 28 May 2024 18:20:24 +0400
Subject: [PATCH 384/400] Remove old notification descturction workaround for
 old X11 systems

There seem to be no need in it anymore
---
 .../settings/settings_notifications.cpp          | 16 ----------------
 .../window/notifications_manager_default.cpp     | 13 +------------
 .../window/notifications_manager_default.h       |  2 --
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index fdfe37148e1d3..1a04419be3247 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -28,7 +28,6 @@ For license and copyright information please follow this link:
 #include "platform/platform_specific.h"
 #include "platform/platform_notifications_manager.h"
 #include "base/platform/base_platform_info.h"
-#include "base/call_delayed.h"
 #include "mainwindow.h"
 #include "core/application.h"
 #include "main/main_session.h"
@@ -133,13 +132,10 @@ class NotificationsCount::SampleWidget : public QWidget {
 	void startAnimation();
 	void animationCallback();
 
-	void destroyDelayed();
-
 	NotificationsCount *_owner;
 	QPixmap _cache;
 	Ui::Animations::Simple _opacity;
 	bool _hiding = false;
-	bool _deleted = false;
 
 };
 
@@ -665,18 +661,6 @@ void NotificationsCount::SampleWidget::animationCallback() {
 			_owner->removeSample(this);
 		}
 		hide();
-		destroyDelayed();
-	}
-}
-
-void NotificationsCount::SampleWidget::destroyDelayed() {
-	if (_deleted) return;
-	_deleted = true;
-
-	// Ubuntu has a lag if deleteLater() called immediately.
-	if constexpr (Platform::IsLinux()) {
-		base::call_delayed(1000, this, [this] { delete this; });
-	} else {
 		deleteLater();
 	}
 }
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index 2ce56b1133d6e..7b4ba23062f4c 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -496,22 +496,11 @@ Widget::Widget(
 	_a_opacity.start([this] { opacityAnimationCallback(); }, 0., 1., st::notifyFastAnim);
 }
 
-void Widget::destroyDelayed() {
-	hide();
-	if (_deleted) return;
-	_deleted = true;
-
-	// Ubuntu has a lag if a fully transparent widget is destroyed immediately.
-	base::call_delayed(1000, this, [this] {
-		manager()->removeWidget(this);
-	});
-}
-
 void Widget::opacityAnimationCallback() {
 	updateOpacity();
 	update();
 	if (!_a_opacity.animating() && _hiding) {
-		destroyDelayed();
+		manager()->removeWidget(this);
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.h b/Telegram/SourceFiles/window/notifications_manager_default.h
index b8e5822468802..5bd4344d8db4a 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.h
+++ b/Telegram/SourceFiles/window/notifications_manager_default.h
@@ -171,7 +171,6 @@ class Widget : public Ui::RpWidget {
 
 private:
 	void opacityAnimationCallback();
-	void destroyDelayed();
 	void moveByShift();
 	void hideAnimated(float64 duration, const anim::transition &func);
 	bool shiftAnimationCallback(crl::time now);
@@ -179,7 +178,6 @@ class Widget : public Ui::RpWidget {
 	const not_null<Manager*> _manager;
 
 	bool _hiding = false;
-	bool _deleted = false;
 	base::binary_guard _hidingDelayed;
 	Ui::Animations::Simple _a_opacity;
 

From 8ad5117495b940912f12c94e5b9f97988c0125af Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 15 Jun 2024 20:55:09 +0400
Subject: [PATCH 385/400] Update lib_ui.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index e9fb40c0d3ef6..599b4d0517dcb 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit e9fb40c0d3ef6f05bfef0f4395c8b2d81bc9823a
+Subproject commit 599b4d0517dcbd70e2367aa7af0e8986e6c22052

From 501cae220056429f13a2ba0f8d93f3b864754236 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Jun 2024 20:57:09 +0400
Subject: [PATCH 386/400] Change InputField::font to InputField::style in
 styles.

---
 Telegram/SourceFiles/boxes/boxes.style           |  7 ++-----
 Telegram/SourceFiles/boxes/max_invite_box.cpp    |  4 ++--
 Telegram/SourceFiles/calls/calls.style           |  1 -
 .../SourceFiles/chat_helpers/chat_helpers.style  |  2 +-
 .../SourceFiles/chat_helpers/message_field.cpp   | 16 ++++++----------
 Telegram/SourceFiles/dialogs/dialogs.style       |  2 +-
 Telegram/SourceFiles/info/info.style             |  4 +---
 Telegram/SourceFiles/intro/intro.style           |  4 +++-
 Telegram/SourceFiles/passport/passport.style     |  4 ++--
 .../SourceFiles/payments/ui/payments_field.cpp   |  4 ++--
 Telegram/SourceFiles/settings/settings.style     |  6 +-----
 Telegram/SourceFiles/ui/chat/chat.style          |  2 +-
 Telegram/SourceFiles/ui/countryinput.cpp         |  4 ++--
 Telegram/SourceFiles/ui/widgets/color_editor.cpp |  4 ++--
 .../ui/widgets/fields/special_fields.cpp         |  4 ++--
 .../window/themes/window_theme_preview.cpp       |  4 ++--
 Telegram/SourceFiles/window/window.style         |  4 +---
 Telegram/lib_ui                                  |  2 +-
 18 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index cfd123c9337c6..f17389f1ba42a 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -237,7 +237,7 @@ shareColumnSkip: 6px;
 shareActivateDuration: 150;
 shareScrollDuration: 300;
 shareComment: InputField(defaultInputField) {
-	font: normalFont;
+	style: defaultTextStyle;
 	textMargins: margins(8px, 8px, 8px, 6px);
 	heightMin: 36px;
 	heightMax: 72px;
@@ -585,7 +585,7 @@ groupStickersRemovePosition: point(6px, 6px);
 groupStickersFieldPadding: margins(8px, 6px, 8px, 6px);
 groupStickersField: InputField(defaultMultiSelectSearchField) {
 	placeholderFont: boxTextFont;
-	font: boxTextFont;
+	style: boxTextStyle;
 	placeholderMargins: margins(0px, 0px, 0px, 0px);
 	textMargins: margins(0px, 7px, 0px, 0px);
 	textBg: boxBg;
@@ -672,7 +672,6 @@ themesMenuToggle: IconButton(defaultIconButton) {
 themesMenuPosition: point(-2px, 25px);
 
 createPollField: InputField(defaultInputField) {
-	font: boxTextFont;
 	textMargins: margins(0px, 4px, 0px, 4px);
 	textAlign: align(left);
 	heightMin: 36px;
@@ -877,7 +876,6 @@ scheduleDateField: InputField(defaultInputField) {
 	placeholderScale: 0.;
 	heightMin: 30px;
 	textAlign: align(top);
-	font: font(14px);
 }
 scheduleTimeField: InputField(scheduleDateField) {
 	border: 0px;
@@ -905,7 +903,6 @@ muteBoxTimeField: InputField(scheduleDateField) {
 	placeholderScale: 0.;
 	heightMin: 30px;
 	textAlign: align(left);
-	font: font(14px);
 }
 muteBoxTimeFieldPadding: margins(5px, 0px, 5px, 0px);
 
diff --git a/Telegram/SourceFiles/boxes/max_invite_box.cpp b/Telegram/SourceFiles/boxes/max_invite_box.cpp
index b6230b673e594..a7c1f84089115 100644
--- a/Telegram/SourceFiles/boxes/max_invite_box.cpp
+++ b/Telegram/SourceFiles/boxes/max_invite_box.cpp
@@ -133,8 +133,8 @@ void MaxInviteBox::paintEvent(QPaintEvent *e) {
 	auto option = QTextOption(style::al_left);
 	option.setWrapMode(QTextOption::WrapAnywhere);
 	p.setFont(_linkOver
-		? st::defaultInputField.font->underline()
-		: st::defaultInputField.font);
+		? st::defaultInputField.style.font->underline()
+		: st::defaultInputField.style.font);
 	p.setPen(st::defaultLinkButton.color);
 	const auto inviteLinkText = _channel->inviteLink().isEmpty()
 		? tr::lng_group_invite_create(tr::now)
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index cc009ad43b068..a133bba683df6 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -1393,7 +1393,6 @@ groupCallScheduleDateField: InputField(groupCallField) {
 	placeholderScale: 0.;
 	heightMin: 30px;
 	textAlign: align(top);
-	font: font(14px);
 }
 groupCallScheduleTimeField: InputField(groupCallScheduleDateField) {
 	textBg: groupCallMembersBg;
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index b3f7e73c978f0..ef96e43666030 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -990,7 +990,7 @@ historyUnreadReactions: TwoIconButton(historyToDown) {
 historyUnreadThingsSkip: 4px;
 
 historyComposeField: InputField(defaultInputField) {
-	font: normalFont;
+	style: defaultTextStyle;
 	textMargins: margins(0px, 0px, 0px, 0px);
 	textAlign: align(left);
 	textFg: historyComposeAreaFg;
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 779bfb4d51d87..bb328564c3684 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -569,10 +569,10 @@ void InitMessageFieldFade(
 		Ui::DestroyChild(b.data());
 	}, topFade->lifetime());
 
+	const auto descent = field->st().style.font->descent;
 	topFade->show();
-	bottomFade->showOn(
-	field->scrollTop().value(
-	) | rpl::map([field, descent = field->st().font->descent](int scroll) {
+	bottomFade->showOn(field->scrollTop().value(
+	) | rpl::map([field, descent](int scroll) {
 		return (scroll + descent) < field->scrollTopMax();
 	}) | rpl::distinct_until_changed());
 }
@@ -766,11 +766,7 @@ bool MessageLinksParser::eventFilter(QObject *object, QEvent *event) {
 			const auto text = static_cast<QKeyEvent*>(event)->text();
 			if (!text.isEmpty() && text.size() < 3) {
 				const auto ch = text[0];
-				if (false
-					|| ch == '\n'
-					|| ch == '\r'
-					|| ch.isSpace()
-					|| ch == QChar::LineSeparator) {
+				if (IsSpace(ch)) {
 					_timer.callOnce(0);
 				}
 			}
@@ -1117,8 +1113,8 @@ void SelectTextInFieldWithMargins(
 	auto textCursor = field->textCursor();
 	// Try to set equal margins for top and bottom sides.
 	const auto charsCountInLine = field->width()
-		/ field->st().font->width('W');
-	const auto linesCount = (field->height() / field->st().font->height);
+		/ field->st().style.font->width('W');
+	const auto linesCount = field->height() / field->st().style.font->height;
 	const auto selectedLines = (selection.to - selection.from)
 		/ charsCountInLine;
 	constexpr auto kMinDiff = ushort(3);
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index dee018efde230..279defe7d4479 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -285,7 +285,7 @@ dialogsFilter: InputField(defaultInputField) {
 	borderRadius: 18px;
 	borderDenominator: 2;
 
-	font: normalFont;
+	style: defaultTextStyle;
 
 	heightMin: 35px;
 }
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index ab16a1bd1d606..8e44a7a79cd64 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -701,7 +701,7 @@ manageGroupReactionsField: InputField(defaultInputField) {
 	placeholderScale: 0.;
 	placeholderFont: normalFont;
 	placeholderShift: -50px;
-	font: normalFont;
+	style: defaultTextStyle;
 	heightMin: 36px;
 	heightMax: 158px;
 }
@@ -764,8 +764,6 @@ editPeerDescription: InputField(defaultInputField) {
 	borderActive: 0px;
 
 	heightMin: 32px;
-
-	font: boxTextFont;
 }
 editPeerDescriptionMargins: margins(22px, 3px, 22px, 2px);
 editPeerPrivaciesMargins: margins(15px, 7px, 22px, 0px);
diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style
index bedbad7489a5c..ae504be09be5e 100644
--- a/Telegram/SourceFiles/intro/intro.style
+++ b/Telegram/SourceFiles/intro/intro.style
@@ -96,7 +96,9 @@ introPhoneTop: 6px;
 introLinkTop: 24px;
 introCountry: InputField(defaultInputField) {
 	textMargins: margins(3px, 27px, 3px, 6px);
-	font: font(16px);
+	style: TextStyle(defaultTextStyle) {
+		font: font(16px);
+	}
 	width: 300px;
 	heightMin: 61px;
 }
diff --git a/Telegram/SourceFiles/passport/passport.style b/Telegram/SourceFiles/passport/passport.style
index c7e2a9466d3fd..c5bf744439535 100644
--- a/Telegram/SourceFiles/passport/passport.style
+++ b/Telegram/SourceFiles/passport/passport.style
@@ -159,7 +159,7 @@ passportDetailsField: InputField(defaultInputField) {
 	placeholderScale: 0.;
 	placeholderFont: normalFont;
 	heightMin: 32px;
-	font: normalFont;
+	style: defaultTextStyle;
 }
 passportDetailsDateField: InputField(passportDetailsField) {
 	textMargins: margins(2px, 8px, 2px, 0px);
@@ -178,7 +178,7 @@ passportDetailsSeparator: FlatLabel(passportPasswordLabelBold) {
 }
 passportDetailsSeparatorPadding: margins(5px, 8px, 5px, 0px);
 passportContactField: InputField(defaultInputField) {
-	font: normalFont;
+	style: defaultTextStyle;
 }
 passportDetailsFieldLeft: 116px;
 passportDetailsFieldTop: 2px;
diff --git a/Telegram/SourceFiles/payments/ui/payments_field.cpp b/Telegram/SourceFiles/payments/ui/payments_field.cpp
index 1314674ce239e..e5fbcb34e68fd 100644
--- a/Telegram/SourceFiles/payments/ui/payments_field.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_field.cpp
@@ -305,7 +305,7 @@ struct SimpleFieldState {
 		.st = st::paymentsMoneyField,
 	});
 	const auto &rule = state->rule;
-	state->currencySkip = rule.space ? state->st.font->spacew : 0;
+	state->currencySkip = rule.space ? state->st.style.font->spacew : 0;
 	state->currencyText = ((!rule.left && rule.space)
 		? QString(QChar(' '))
 		: QString()) + (*rule.international
@@ -343,7 +343,7 @@ struct SimpleFieldState {
 	}
 	const auto updateRight = [=] {
 		const auto text = result->getLastText();
-		const auto width = state->st.font->width(text);
+		const auto width = state->st.style.font->width(text);
 		const auto &rule = state->rule;
 		const auto symbol = QChar(rule.decimal);
 		const auto decimal = text.indexOf(symbol);
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index d931f1df710b8..5fb97628596b7 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -214,8 +214,6 @@ settingsBio: InputField(defaultInputField) {
 	borderActive: 0px;
 
 	heightMin: 32px;
-
-	font: boxTextFont;
 }
 
 settingsBioMargins: margins(22px, 6px, 22px, 4px);
@@ -309,8 +307,6 @@ settingsDeviceName: InputField(defaultInputField) {
 	placeholderFont: normalFont;
 
 	heightMin: 29px;
-
-	font: boxTextFont;
 }
 
 dictionariesSectionButton: SettingsButton(settingsUpdateToggle) {
@@ -677,5 +673,5 @@ settingsChatLinkField: InputField(defaultInputField) {
 
 	heightMin: 32px;
 
-	font: normalFont;
+	style: defaultTextStyle;
 }
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 732697926a32e..7f82075215d48 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1162,5 +1162,5 @@ factcheckField: InputField(defaultInputField) {
 
 	heightMin: 24px;
 
-	font: normalFont;
+	style: defaultTextStyle;
 }
diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
index a9c9e1add1e67..bdf77d1c18698 100644
--- a/Telegram/SourceFiles/ui/countryinput.cpp
+++ b/Telegram/SourceFiles/ui/countryinput.cpp
@@ -55,7 +55,7 @@ void CountryInput::paintEvent(QPaintEvent *e) {
 		st::introCountryIconPosition.y(),
 		width());
 
-	p.setFont(_st.font);
+	p.setFont(_st.style.font);
 	p.setPen(_st.textFg);
 	p.drawText(rect().marginsRemoved(_st.textMargins), _text, _st.textAlign);
 }
@@ -159,7 +159,7 @@ rpl::producer<QString> CountryInput::codeChanged() const {
 }
 
 void CountryInput::setText(const QString &newText) {
-	_text = _st.font->elided(
+	_text = _st.style.font->elided(
 		newText,
 		width() - _st.textMargins.left() - _st.textMargins.right());
 }
diff --git a/Telegram/SourceFiles/ui/widgets/color_editor.cpp b/Telegram/SourceFiles/ui/widgets/color_editor.cpp
index 3141faef39184..bf2ba26fcfc1c 100644
--- a/Telegram/SourceFiles/ui/widgets/color_editor.cpp
+++ b/Telegram/SourceFiles/ui/widgets/color_editor.cpp
@@ -704,7 +704,7 @@ void ColorEditor::Field::correctValue(
 }
 
 void ColorEditor::Field::paintAdditionalPlaceholder(QPainter &p) {
-	p.setFont(_st.font);
+	p.setFont(_st.style.font);
 	p.setPen(_st.placeholderFg);
 	const auto inner = QRect(
 		_st.textMargins.right(),
@@ -829,7 +829,7 @@ void ColorEditor::ResultField::correctValue(
 }
 
 void ColorEditor::ResultField::paintAdditionalPlaceholder(QPainter &p) {
-	p.setFont(_st.font);
+	p.setFont(_st.style.font);
 	p.setPen(_st.placeholderFg);
 	p.drawText(
 		QRect(
diff --git a/Telegram/SourceFiles/ui/widgets/fields/special_fields.cpp b/Telegram/SourceFiles/ui/widgets/fields/special_fields.cpp
index 81b1b1a0d5058..0b7487caf12f6 100644
--- a/Telegram/SourceFiles/ui/widgets/fields/special_fields.cpp
+++ b/Telegram/SourceFiles/ui/widgets/fields/special_fields.cpp
@@ -267,14 +267,14 @@ UsernameInput::UsernameInput(
 void UsernameInput::setLinkPlaceholder(const QString &placeholder) {
 	_linkPlaceholder = placeholder;
 	if (!_linkPlaceholder.isEmpty()) {
-		setTextMargins(style::margins(_st.textMargins.left() + _st.font->width(_linkPlaceholder), _st.textMargins.top(), _st.textMargins.right(), _st.textMargins.bottom()));
+		setTextMargins(style::margins(_st.textMargins.left() + _st.style.font->width(_linkPlaceholder), _st.textMargins.top(), _st.textMargins.right(), _st.textMargins.bottom()));
 		setPlaceholderHidden(true);
 	}
 }
 
 void UsernameInput::paintAdditionalPlaceholder(QPainter &p) {
 	if (!_linkPlaceholder.isEmpty()) {
-		p.setFont(_st.font);
+		p.setFont(_st.style.font);
 		p.setPen(_st.placeholderFg);
 		p.drawText(QRect(_st.textMargins.left(), _st.textMargins.top(), width(), height() - _st.textMargins.top() - _st.textMargins.bottom()), _linkPlaceholder, style::al_topleft);
 	}
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index d486e81b3aac7..42f1abb3c2f05 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -604,7 +604,7 @@ void Generator::paintComposeArea() {
 
 	_p->setClipRect(field);
 	_p->save();
-	_p->setFont(st::historyComposeField.font);
+	_p->setFont(st::historyComposeField.style.font);
 	_p->setPen(st::historyComposeField.placeholderFg[_palette]);
 
 	auto placeholderRect = QRect(
@@ -658,7 +658,7 @@ void Generator::paintDialogs() {
 	_p->save();
 	_p->setClipRect(filter);
 	auto phRect = QRect(filter.x() + st::dialogsFilter.textMargins.left() + st::dialogsFilter.placeholderMargins.left(), filter.y() + st::dialogsFilter.textMargins.top() + st::dialogsFilter.placeholderMargins.top(), filter.width() - st::dialogsFilter.textMargins.left() - st::dialogsFilter.textMargins.right(), filter.height() - st::dialogsFilter.textMargins.top() - st::dialogsFilter.textMargins.bottom());
-	_p->setFont(st::dialogsFilter.font);
+	_p->setFont(st::dialogsFilter.style.font);
 	_p->setPen(st::dialogsFilter.placeholderFg[_palette]);
 	_p->drawText(phRect, tr::lng_dlg_filter(tr::now), QTextOption(st::dialogsFilter.placeholderAlign));
 	_p->restore();
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 8b13c0a3691f5..37654c990738f 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -61,7 +61,7 @@ notifyActionsDuration: 200;
 notifyHideAllHeight: 36px;
 
 notifyReplyArea: InputField(defaultInputField) {
-	font: normalFont;
+	style: defaultTextStyle;
 	textMargins: margins(8px, 8px, 8px, 6px);
 	heightMin: 36px;
 	heightMax: 72px;
@@ -235,8 +235,6 @@ createThemeLink: InputField(defaultInputField) {
 	placeholderFont: boxTextFont;
 
 	heightMin: 34px;
-
-	font: boxTextFont;
 }
 
 windowFiltersWidth: 72px;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 599b4d0517dcb..924301cd62d91 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 599b4d0517dcbd70e2367aa7af0e8986e6c22052
+Subproject commit 924301cd62d918ef25ab81d758ed4b2fff903f2e

From c1f36d43d0441d8cecb53ead6ae7a72df72f0e80 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Jun 2024 14:15:18 +0400
Subject: [PATCH 387/400] Support modern blockquote/pre display.

---
 .../chat_helpers/chat_helpers.style           | 27 ++++++++++++++++++-
 .../chat_helpers/message_field.cpp            | 10 +++++++
 Telegram/SourceFiles/ui/chat/chat.style       | 27 ++-----------------
 Telegram/lib_ui                               |  2 +-
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index ef96e43666030..6b69aa1367647 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -989,8 +989,33 @@ historyUnreadReactions: TwoIconButton(historyToDown) {
 }
 historyUnreadThingsSkip: 4px;
 
+historyQuoteStyle: QuoteStyle(defaultQuoteStyle) {
+	padding: margins(10px, 2px, 4px, 2px);
+	verticalSkip: 4px;
+	outline: 3px;
+	outlineShift: 2px;
+	radius: 5px;
+}
+historyTextStyle: TextStyle(defaultTextStyle) {
+	blockquote: QuoteStyle(historyQuoteStyle) {
+		padding: margins(10px, 2px, 20px, 2px);
+		icon: icon{{ "chat/mini_quote", windowFg }};
+		iconPosition: point(4px, 4px);
+		expand: icon{{ "intro_country_dropdown", windowFg }};
+		expandPosition: point(6px, 4px);
+		collapse: icon{{ "intro_country_dropdown-flip_vertical", windowFg }};
+		collapsePosition: point(6px, 4px);
+	}
+	pre: QuoteStyle(historyQuoteStyle) {
+		header: 20px;
+		headerPosition: point(10px, 2px);
+		scrollable: true;
+		icon: icon{{ "chat/mini_copy", windowFg }};
+		iconPosition: point(4px, 2px);
+	}
+}
 historyComposeField: InputField(defaultInputField) {
-	style: defaultTextStyle;
+	style: historyTextStyle;
 	textMargins: margins(0px, 0px, 0px, 0px);
 	textAlign: align(left);
 	textFg: historyComposeAreaFg;
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index bb328564c3684..d65a7acf9063c 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -14,6 +14,7 @@ For license and copyright information please follow this link:
 #include "base/qthelp_regex.h"
 #include "base/qthelp_url.h"
 #include "base/event_filter.h"
+#include "ui/chat/chat_style.h"
 #include "ui/layers/generic_box.h"
 #include "ui/rect.h"
 #include "core/shortcuts.h"
@@ -344,6 +345,15 @@ void InitMessageFieldHandlers(
 			DefaultEditLinkCallback(show, field, fieldStyle));
 		InitSpellchecker(show, field, fieldStyle != nullptr);
 	}
+	const auto style = field->lifetime().make_state<Ui::ChatStyle>(
+		session->colorIndicesValue());
+	field->setPreCache([=] {
+		return style->messageStyle(false, false).preCache.get();
+	});
+	field->setBlockquoteCache([=] {
+		const auto colorIndex = session->user()->colorIndex();
+		return style->coloredQuoteCache(false, colorIndex).get();
+	});
 }
 
 [[nodiscard]] bool IsGoodFactcheckUrl(QStringView url) {
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 7f82075215d48..e4ff33434b40d 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -54,31 +54,8 @@ msgDateDelta: point(2px, 5px);
 msgDateImgDelta: 4px;
 msgDateImgPadding: point(8px, 2px);
 
-messageQuoteStyle: QuoteStyle(defaultQuoteStyle) {
-	padding: margins(10px, 2px, 4px, 2px);
-	verticalSkip: 4px;
-	outline: 3px;
-	outlineShift: 2px;
-	radius: 5px;
-}
-messageTextStyle: TextStyle(defaultTextStyle) {
-	blockquote: QuoteStyle(messageQuoteStyle) {
-		padding: margins(10px, 2px, 20px, 2px);
-		icon: icon{{ "chat/mini_quote", windowFg }};
-		iconPosition: point(4px, 4px);
-		expand: icon{{ "intro_country_dropdown", windowFg }};
-		expandPosition: point(6px, 4px);
-		collapse: icon{{ "intro_country_dropdown-flip_vertical", windowFg }};
-		collapsePosition: point(6px, 4px);
-	}
-	pre: QuoteStyle(messageQuoteStyle) {
-		header: 20px;
-		headerPosition: point(10px, 2px);
-		scrollable: true;
-		icon: icon{{ "chat/mini_copy", windowFg }};
-		iconPosition: point(4px, 2px);
-	}
-}
+messageQuoteStyle: historyQuoteStyle;
+messageTextStyle: historyTextStyle;
 historyPagePreview: QuoteStyle(messageQuoteStyle) {
 	padding: margins(10px, 5px, 7px, 7px);
 }
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 924301cd62d91..d4d51136cd5ff 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 924301cd62d918ef25ab81d758ed4b2fff903f2e
+Subproject commit d4d51136cd5ff54b84b2863a7ece39693b5ce522

From fa8ed186d86d406d03f1b02b1ce728da9a0a228a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 10 Jun 2024 10:55:44 +0400
Subject: [PATCH 388/400] Improve field fade conditions.

---
 .../chat_helpers/message_field.cpp            | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index d65a7acf9063c..cd71802181a60 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -580,11 +580,21 @@ void InitMessageFieldFade(
 	}, topFade->lifetime());
 
 	const auto descent = field->st().style.font->descent;
-	topFade->show();
-	bottomFade->showOn(field->scrollTop().value(
-	) | rpl::map([field, descent](int scroll) {
-		return (scroll + descent) < field->scrollTopMax();
-	}) | rpl::distinct_until_changed());
+	rpl::merge(
+		field->changes(),
+		field->scrollTop().changes() | rpl::to_empty,
+		field->sizeValue() | rpl::to_empty
+	) | rpl::start_with_next([=] {
+		const auto topHidden = !field->scrollTop().current();
+		if (topFade->isHidden() != topHidden) {
+			topFade->setVisible(!topHidden);
+		}
+		const auto adjusted = field->scrollTop().current() + descent;
+		const auto bottomHidden = (adjusted >= field->scrollTopMax());
+		if (bottomFade->isHidden() != bottomHidden) {
+			bottomFade->setVisible(!bottomHidden);
+		}
+	}, topFade->lifetime());
 }
 
 InlineBotQuery ParseInlineBotQuery(

From 5e8c3fb146df8d693ecccfb70d9afbe427bfd6be Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 10 Jun 2024 18:05:37 +0400
Subject: [PATCH 389/400] Allow editing syntax highlighting language.

---
 Telegram/Resources/langs/lang.strings         |  3 +
 .../SourceFiles/boxes/create_poll_box.cpp     | 11 ++-
 .../chat_helpers/message_field.cpp            | 77 ++++++++++++++++---
 .../SourceFiles/chat_helpers/message_field.h  |  3 +
 .../history_view_compose_controls.cpp         |  1 +
 Telegram/lib_ui                               |  2 +-
 6 files changed, 86 insertions(+), 11 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index fa1aab1b885c2..7a3c42b060119 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3582,6 +3582,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_formatting_link_text" = "Text";
 "lng_formatting_link_url" = "URL";
 "lng_formatting_link_create" = "Create";
+"lng_formatting_code_title" = "Code Language";
+"lng_formatting_code_language" = "Language for syntax highlighting.";
+"lng_formatting_code_auto" = "Auto-Detect";
 
 "lng_text_copied" = "Text copied to clipboard.";
 "lng_code_copied" = "Block copied to clipboard.";
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 46138e3fd3724..9ff85e099abac 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -1044,7 +1044,16 @@ not_null<Ui::InputField*> CreatePollBox::setupSolution(
 	solution->setInstantReplaces(Ui::InstantReplaces::Default());
 	solution->setInstantReplacesEnabled(
 		Core::App().settings().replaceEmojiValue());
-	solution->setMarkdownReplacesEnabled(true);
+	solution->setMarkdownReplacesEnabled(rpl::single(
+		Ui::MarkdownEnabledState{ Ui::MarkdownEnabled{ {
+			Ui::InputField::kTagBold,
+			Ui::InputField::kTagItalic,
+			Ui::InputField::kTagUnderline,
+			Ui::InputField::kTagStrikeOut,
+			Ui::InputField::kTagCode,
+			Ui::InputField::kTagSpoiler,
+		} } }
+	));
 	solution->setEditLinkCallback(
 		DefaultEditLinkCallback(_controller->uiShow(), solution));
 	solution->customTab(true);
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index cd71802181a60..d36d2c4655cdf 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -41,6 +41,7 @@ For license and copyright information please follow this link:
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_settings.h"
 #include "base/qt/qt_common_adapters.h"
 
 #include <QtCore/QMimeData>
@@ -59,6 +60,7 @@ using EditLinkSelection = Ui::InputField::EditLinkSelection;
 
 constexpr auto kParseLinksTimeout = crl::time(1000);
 constexpr auto kTypesDuration = 4 * crl::time(1000);
+constexpr auto kCodeLanguageLimit = 32;
 
 // For mention / custom emoji tags save and validate selfId,
 // ignore tags for different users.
@@ -223,6 +225,51 @@ void EditLinkBox(
 	}, text->lifetime());
 }
 
+void EditCodeLanguageBox(
+		not_null<Ui::GenericBox*> box,
+		QString now,
+		Fn<void(QString)> save) {
+	Expects(save != nullptr);
+
+	box->setTitle(tr::lng_formatting_code_title());
+	box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		tr::lng_formatting_code_language(),
+		st::settingsAddReplyLabel));
+	const auto field = box->addRow(object_ptr<Ui::InputField>(
+		box,
+		st::settingsAddReplyField,
+		tr::lng_formatting_code_auto(),
+		now.trimmed()));
+	box->setFocusCallback([=] {
+		field->setFocusFast();
+	});
+	field->selectAll();
+	field->setMaxLength(kCodeLanguageLimit);
+
+	Ui::AddLengthLimitLabel(field, kCodeLanguageLimit);
+
+	const auto callback = [=] {
+		const auto name = field->getLastText().trimmed();
+		const auto check = QRegularExpression("^[a-zA-Z0-9\\+\\-]+$");
+		if (check.match(name).hasMatch()) {
+			auto weak = Ui::MakeWeak(box);
+			save(name);
+			if (const auto strong = weak.data()) {
+				strong->closeBox();
+			}
+		} else {
+			field->showError();
+		}
+	};
+	field->submits(
+	) | rpl::start_with_next(callback, field->lifetime());
+	box->addButton(tr::lng_settings_save(), callback);
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+}
+
 TextWithEntities StripSupportHashtag(TextWithEntities text) {
 	static const auto expression = QRegularExpression(
 		u"\\n?#tsf[a-z0-9_-]*[\\s#a-z0-9_-]*$"_q,
@@ -321,6 +368,13 @@ Fn<bool(
 	};
 }
 
+Fn<void(QString now, Fn<void(QString)> save)> DefaultEditLanguageCallback(
+		std::shared_ptr<Ui::Show> show) {
+	return [=](QString now, Fn<void(QString)> save) {
+		show->showBox(Box(EditCodeLanguageBox, now, save));
+	};
+}
+
 void InitMessageFieldHandlers(
 		not_null<Main::Session*> session,
 		std::shared_ptr<Main::SessionShow> show,
@@ -343,6 +397,7 @@ void InitMessageFieldHandlers(
 	if (show) {
 		field->setEditLinkCallback(
 			DefaultEditLinkCallback(show, field, fieldStyle));
+		field->setEditLanguageCallback(DefaultEditLanguageCallback(show));
 		InitSpellchecker(show, field, fieldStyle != nullptr);
 	}
 	const auto style = field->lifetime().make_state<Ui::ChatStyle>(
@@ -585,15 +640,19 @@ void InitMessageFieldFade(
 		field->scrollTop().changes() | rpl::to_empty,
 		field->sizeValue() | rpl::to_empty
 	) | rpl::start_with_next([=] {
-		const auto topHidden = !field->scrollTop().current();
-		if (topFade->isHidden() != topHidden) {
-			topFade->setVisible(!topHidden);
-		}
-		const auto adjusted = field->scrollTop().current() + descent;
-		const auto bottomHidden = (adjusted >= field->scrollTopMax());
-		if (bottomFade->isHidden() != bottomHidden) {
-			bottomFade->setVisible(!bottomHidden);
-		}
+		// InputField::changes fires before the auto-resize is being applied,
+		// so for the scroll values to be accurate we enqueue the check.
+		InvokeQueued(field, [=] {
+			const auto topHidden = !field->scrollTop().current();
+			if (topFade->isHidden() != topHidden) {
+				topFade->setVisible(!topHidden);
+			}
+			const auto adjusted = field->scrollTop().current() + descent;
+			const auto bottomHidden = (adjusted >= field->scrollTopMax());
+			if (bottomFade->isHidden() != bottomHidden) {
+				bottomFade->setVisible(!bottomHidden);
+			}
+		});
 	}, topFade->lifetime());
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h
index 1e67642a767a7..7efdb7d186b4b 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.h
+++ b/Telegram/SourceFiles/chat_helpers/message_field.h
@@ -35,6 +35,7 @@ class Show;
 
 namespace Ui {
 class PopupMenu;
+class Show;
 } // namespace Ui
 
 [[nodiscard]] QString PrepareMentionTag(not_null<UserData*> user);
@@ -51,6 +52,8 @@ Fn<bool(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::InputField*> field,
 		const style::InputField *fieldStyle = nullptr);
+Fn<void(QString now, Fn<void(QString)> save)> DefaultEditLanguageCallback(
+	std::shared_ptr<Ui::Show> show);
 void InitMessageFieldHandlers(
 	not_null<Main::Session*> session,
 	std::shared_ptr<Main::SessionShow> show, // may be null
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 cc4a91a1f5b1d..16a55968995b2 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1658,6 +1658,7 @@ void ComposeControls::initField() {
 	InitMessageFieldFade(_field, _st.field.textBg);
 	_field->setEditLinkCallback(
 		DefaultEditLinkCallback(_show, _field, &_st.boxField));
+	_field->setEditLanguageCallback(DefaultEditLanguageCallback(_show));
 	initAutocomplete();
 	const auto allow = [=](not_null<DocumentData*> emoji) {
 		return _history
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d4d51136cd5ff..20caa93a8d2b5 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d4d51136cd5ff54b84b2863a7ece39693b5ce522
+Subproject commit 20caa93a8d2b5b279f36eb19d9200be071420ba3

From ec40292cbf336187fa3cf4dbaf6e4dd9f6c41901 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jun 2024 21:22:06 +0400
Subject: [PATCH 390/400] Allow editing of collapsed quotes.

---
 .../boxes/peers/edit_peer_reactions.cpp       | 13 ++++++--
 .../chat_helpers/message_field.cpp            | 32 +++++++++++++------
 .../SourceFiles/chat_helpers/message_field.h  |  2 +-
 Telegram/SourceFiles/core/ui_integration.cpp  |  2 +-
 Telegram/SourceFiles/core/ui_integration.h    |  2 +-
 Telegram/lib_ui                               |  2 +-
 6 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
index 0873426e52249..8905c33c13cde 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "base/event_filter.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_selector.h"
+#include "core/ui_integration.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_document.h"
@@ -351,8 +352,8 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 	const auto customEmojiPaused = [controller = args.controller] {
 		return controller->isGifPausedAtLeastFor(PauseReason::Layer);
 	};
-	raw->setCustomEmojiFactory([=](QStringView data, Fn<void()> update)
-	-> std::unique_ptr<Ui::Text::CustomEmoji> {
+	auto factory = [=](QStringView data, Fn<void()> update)
+		-> std::unique_ptr<Ui::Text::CustomEmoji> {
 		const auto id = Data::ParseCustomEmojiData(data);
 		auto result = owner->customEmojiManager().create(
 			data,
@@ -364,7 +365,13 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 		}
 		using namespace Ui::Text;
 		return std::make_unique<FirstFrameEmoji>(std::move(result));
-	}, std::move(customEmojiPaused));
+	};
+	raw->setCustomTextContext([=](Fn<void()> repaint) {
+		return std::any(Core::MarkedTextContext{
+			.session = session,
+			.customEmojiRepaint = std::move(repaint),
+		});
+	}, customEmojiPaused, customEmojiPaused, std::move(factory));
 
 	const auto callback = args.callback;
 	const auto isCustom = [=](DocumentId id) {
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index d36d2c4655cdf..465830fd1823e 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -20,6 +20,7 @@ For license and copyright information please follow this link:
 #include "core/shortcuts.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "core/ui_integration.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/wrap/vertical_layout.h"
@@ -322,15 +323,24 @@ TextWithTags PrepareEditText(not_null<HistoryItem*> item) {
 
 bool EditTextChanged(
 		not_null<HistoryItem*> item,
-		const TextWithTags &updated) {
+		TextWithTags updated) {
 	const auto original = PrepareEditText(item);
 
+	auto originalWithEntities = TextWithEntities{
+		std::move(original.text),
+		TextUtilities::ConvertTextTagsToEntities(original.tags)
+	};
+	auto updatedWithEntities = TextWithEntities{
+		std::move(updated.text),
+		TextUtilities::ConvertTextTagsToEntities(updated.tags)
+	};
+	TextUtilities::PrepareForSending(originalWithEntities, 0);
+	TextUtilities::PrepareForSending(updatedWithEntities, 0);
+
 	// Tags can be different for the same entities, because for
 	// animated emoji each tag contains a different random number.
 	// So we compare entities instead of tags.
-	return (original.text != updated.text)
-		|| (TextUtilities::ConvertTextTagsToEntities(original.tags)
-			!= TextUtilities::ConvertTextTagsToEntities(updated.tags));
+	return originalWithEntities != updatedWithEntities;
 }
 
 Fn<bool(
@@ -384,12 +394,16 @@ void InitMessageFieldHandlers(
 		const style::InputField *fieldStyle) {
 	field->setTagMimeProcessor(
 		FieldTagMimeProcessor(session, allowPremiumEmoji));
-	const auto paused = [customEmojiPaused] {
+	field->setCustomTextContext([=](Fn<void()> repaint) {
+		return std::any(Core::MarkedTextContext{
+			.session = session,
+			.customEmojiRepaint = std::move(repaint),
+		});
+	}, [customEmojiPaused] {
 		return On(PowerSaving::kEmojiChat) || customEmojiPaused();
-	};
-	field->setCustomEmojiFactory(
-		session->data().customEmojiManager().factory(),
-		std::move(customEmojiPaused));
+	}, [customEmojiPaused] {
+		return On(PowerSaving::kChatSpoiler) || customEmojiPaused();
+	});
 	field->setInstantReplaces(Ui::InstantReplaces::Default());
 	field->setInstantReplacesEnabled(
 		Core::App().settings().replaceEmojiValue());
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h
index 7efdb7d186b4b..041b54d661eb4 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.h
+++ b/Telegram/SourceFiles/chat_helpers/message_field.h
@@ -42,7 +42,7 @@ class Show;
 [[nodiscard]] TextWithTags PrepareEditText(not_null<HistoryItem*> item);
 [[nodiscard]] bool EditTextChanged(
 	not_null<HistoryItem*> item,
-	const TextWithTags &updated);
+	TextWithTags updated);
 
 Fn<bool(
 	Ui::InputField::EditLinkSelection selection,
diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index f3de162ce0270..1bc5a1f852305 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -271,7 +271,7 @@ bool UiIntegration::copyPreOnClick(const QVariant &context) {
 }
 
 std::unique_ptr<Ui::Text::CustomEmoji> UiIntegration::createCustomEmoji(
-		const QString &data,
+		QStringView data,
 		const std::any &context) {
 	const auto my = std::any_cast<MarkedTextContext>(&context);
 	if (!my || !my->session) {
diff --git a/Telegram/SourceFiles/core/ui_integration.h b/Telegram/SourceFiles/core/ui_integration.h
index 36ee45777c267..a745f0fce85b6 100644
--- a/Telegram/SourceFiles/core/ui_integration.h
+++ b/Telegram/SourceFiles/core/ui_integration.h
@@ -58,7 +58,7 @@ class UiIntegration final : public Ui::Integration {
 	const Ui::Emoji::One *defaultEmojiVariant(
 		const Ui::Emoji::One *emoji) override;
 	std::unique_ptr<Ui::Text::CustomEmoji> createCustomEmoji(
-		const QString &data,
+		QStringView data,
 		const std::any &context) override;
 	Fn<void()> createSpoilerRepaint(const std::any &context) override;
 	bool allowClickHandlerActivation(
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 20caa93a8d2b5..29bce3f8ff693 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 20caa93a8d2b5b279f36eb19d9200be071420ba3
+Subproject commit 29bce3f8ff693e0386617dfd550a225d0ff11c5d

From 9a25d2c4139e49312300f0de237725765fb338ca Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jun 2024 18:04:12 +0400
Subject: [PATCH 391/400] Simplify correct unicode characters counting.

---
 Telegram/SourceFiles/history/history_widget.cpp              | 2 +-
 .../history/view/controls/history_view_compose_controls.cpp  | 5 +++--
 Telegram/SourceFiles/settings/settings_information.cpp       | 3 +--
 Telegram/lib_ui                                              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index a805c547962e1..e81fc1bc22814 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -7513,7 +7513,7 @@ void HistoryWidget::showPremiumToast(not_null<DocumentData*> document) {
 }
 
 void HistoryWidget::checkCharsCount() {
-	_fieldCharsCountManager.setCount(Ui::FieldCharacterCount(_field));
+	_fieldCharsCountManager.setCount(Ui::ComputeFieldCharacterCount(_field));
 	checkCharsLimitation();
 }
 
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 16a55968995b2..779f0386b1b78 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -3268,7 +3268,7 @@ not_null<Ui::RpWidget*> ComposeControls::likeAnimationTarget() const {
 }
 
 int ComposeControls::fieldCharacterCount() const {
-	return Ui::FieldCharacterCount(_field);
+	return Ui::ComputeFieldCharacterCount(_field);
 }
 
 bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
@@ -3451,7 +3451,8 @@ void ComposeControls::checkCharsLimitation() {
 	const auto maxCaptionSize = !hasMediaWithCaption
 		? MaxMessageSize
 		: Data::PremiumLimits(&session()).captionLengthCurrent();
-	const auto remove = Ui::FieldCharacterCount(_field) - maxCaptionSize;
+	const auto remove = Ui::ComputeFieldCharacterCount(_field)
+		- maxCaptionSize;
 	if (remove > 0) {
 		if (!_charsLimitation) {
 			using namespace Controls;
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index 9db8d59a92138..7be04db17b05e 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -573,8 +573,7 @@ void SetupBio(
 		}
 		changed->fire(*current != text);
 		const auto limit = self->isPremium() ? premiumLimit : defaultLimit;
-		const auto countLeft = limit
-			- bio->lastTextSizeWithoutSurrogatePairsCount();
+		const auto countLeft = limit - Ui::ComputeFieldCharacterCount(bio);
 		countdown->setText(QString::number(countLeft));
 		countdown->setTextColorOverride(
 			countLeft < 0 ? st::boxTextFgError->c : std::optional<QColor>());
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 29bce3f8ff693..179a7ec1c1c43 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 29bce3f8ff693e0386617dfd550a225d0ff11c5d
+Subproject commit 179a7ec1c1c4310e1c8c935e466d23cbfbe07221

From f748988ae3d27aae00f0efff403cda1099ae0996 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 15 Jun 2024 20:59:19 +0400
Subject: [PATCH 392/400] Update Qt patches.

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 02c3f9f3e935b..03ed611f20740 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 803f1c2630f5eb0d3b00ba3f095b3079c0533156 \
+	&& git fetch --depth=1 origin 8639205c2095a3f015449f8995fbfe16405218b8 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index a705fa84388b5..011476c503b46 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -435,7 +435,7 @@ def runStages():
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout c237d12bcd
+    git checkout 8639205c20
 """)
 
 stage('msys64', """

From f37d056c14caf43befa8d1f7f779b091f888dca6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 15 Jun 2024 21:06:23 +0400
Subject: [PATCH 393/400] Beta version 5.1.8.

- Support nice blockquotes and code blocks edition when composing messages.
- Support collapsing blockquotes and specifying syntax highlight language.
- Support nice spoiler animation in the message composing input field.
---
 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                                |  6 ++++++
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index fed726359bba3..0fd7008c4bc1b 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.1.7.0" />
+    Version="5.1.8.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index fb620ebceab8f..642b222dad020 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,1,7,0
- PRODUCTVERSION 5,1,7,0
+ FILEVERSION 5,1,8,0
+ PRODUCTVERSION 5,1,8,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.1.7.0"
+            VALUE "FileVersion", "5.1.8.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.7.0"
+            VALUE "ProductVersion", "5.1.8.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 7f599ef595fc2..48faaa4b8055e 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,1,7,0
- PRODUCTVERSION 5,1,7,0
+ FILEVERSION 5,1,8,0
+ PRODUCTVERSION 5,1,8,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.1.7.0"
+            VALUE "FileVersion", "5.1.8.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.1.7.0"
+            VALUE "ProductVersion", "5.1.8.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 960408a6517c2..751c3b0265af1 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 = 5001007;
-constexpr auto AppVersionStr = "5.1.7";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 5001008;
+constexpr auto AppVersionStr = "5.1.8";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 6f0f009fbea3a..37dc61b494997 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5001007
+AppVersion         5001008
 AppVersionStrMajor 5.1
-AppVersionStrSmall 5.1.7
-AppVersionStr      5.1.7
-BetaChannel        0
+AppVersionStrSmall 5.1.8
+AppVersionStr      5.1.8
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 5.1.7
+AppVersionOriginal 5.1.8.beta
diff --git a/changelog.txt b/changelog.txt
index 5eb0f2e7e82c2..a5ea6efcc3b9c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+5.1.8 beta (15.06.24)
+
+- Support nice blockquotes and code blocks edition when composing messages.
+- Support collapsing blockquotes and specifying syntax highlight language.
+- Support nice spoiler animation in the message composing input field.
+
 5.1.7 (14.06.24)
 
 - Fix recently searched hashtags in chats search.

From 90068f626199154d05ebc8be1771f47c386df210 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 15 Jun 2024 21:16:55 +0400
Subject: [PATCH 394/400] Beta version 5.1.8: Update tg_owt on Linux.

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 03ed611f20740..70f19b2c68b26 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -761,7 +761,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 afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60 \
+	&& git fetch --depth=1 origin c9cc4390ab951f2cbc103ff783a11f398b27660b \
 	&& git reset --hard FETCH_HEAD \
 	&& git submodule update --init --recursive --depth=1 \
 	&& rm -rf .git \
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a571c7197ec31..f1a80eb02fdbd 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -165,7 +165,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 803f1c2630f5eb0d3b00ba3f095b3079c0533156
+    source-commit: 8639205c2095a3f015449f8995fbfe16405218b8
     plugin: dump
     override-pull: |
       craftctl default
@@ -434,7 +434,7 @@ parts:
   webrtc:
     source: https://github.com/desktop-app/tg_owt.git
     source-depth: 1
-    source-commit: 3bb3d757681e6cc5135aec6529a753dc3dcdcfb9
+    source-commit: c9cc4390ab951f2cbc103ff783a11f398b27660b
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s

From 4e9b5b0d33a1dddd0100dc0b4a2bd2e613fe0ab6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 15 Jun 2024 22:45:21 +0400
Subject: [PATCH 395/400] Beta version 5.1.8: Fix build.

---
 Telegram/SourceFiles/settings/settings_experimental.cpp | 2 +-
 Telegram/lib_ui                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_experimental.cpp b/Telegram/SourceFiles/settings/settings_experimental.cpp
index 0149872459e6f..34a97dfad846a 100644
--- a/Telegram/SourceFiles/settings/settings_experimental.cpp
+++ b/Telegram/SourceFiles/settings/settings_experimental.cpp
@@ -145,7 +145,7 @@ void SetupExperimental(
 	addToggle(Core::kOptionFractionalScalingEnabled);
 	addToggle(Window::kOptionViewProfileInChatsListContextMenu);
 	addToggle(Info::Profile::kOptionShowPeerIdBelowAbout);
-	addToggle(Ui::GL::kOptionAllowLinuxNvidiaOpenGL);
+	addToggle(Ui::GL::kOptionAllowX11NvidiaOpenGL);
 	addToggle(Ui::kOptionUseSmallMsgBubbleRadius);
 	addToggle(Media::Player::kOptionDisableAutoplayNext);
 	addToggle(kOptionSendLargePhotos);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 179a7ec1c1c43..83eae8c9e03be 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 179a7ec1c1c4310e1c8c935e466d23cbfbe07221
+Subproject commit 83eae8c9e03bedb791ef47034079a3bd265e17da

From 81d7fcba7e3e6241755fecc1a648f63961a8f9bf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 15 Jun 2024 23:03:55 +0400
Subject: [PATCH 396/400] Beta version 5.1.8: Fix build with GCC.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 83eae8c9e03be..e54296fc1d8a8 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 83eae8c9e03bedb791ef47034079a3bd265e17da
+Subproject commit e54296fc1d8a8b1a3d92846ce7d02f3f90b0a32e

From 032fe3e0fc16421642418717b2a2b0b2032bc22b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 15 Jun 2024 22:40:04 +0400
Subject: [PATCH 397/400] Remove std::optional indrection for nullable XCB
 types

---
 .../SourceFiles/platform/linux/main_window_linux.cpp | 12 ++++++------
 Telegram/lib_base                                    |  2 +-
 Telegram/lib_ui                                      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index ff9fddc747bdb..764b90bb6cd87 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -57,7 +57,7 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
 	}
 
 	const auto root = base::Platform::XCB::GetRootWindow(connection);
-	if (!root.has_value()) {
+	if (!root) {
 		return;
 	}
 
@@ -65,7 +65,7 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
 		connection,
 		"_NET_WM_STATE");
 
-	if (!stateAtom.has_value()) {
+	if (!stateAtom) {
 		return;
 	}
 
@@ -73,18 +73,18 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
 		connection,
 		"_NET_WM_STATE_SKIP_TASKBAR");
 
-	if (!skipTaskbarAtom.has_value()) {
+	if (!skipTaskbarAtom) {
 		return;
 	}
 
 	xcb_client_message_event_t xev;
 	xev.response_type = XCB_CLIENT_MESSAGE;
-	xev.type = *stateAtom;
+	xev.type = stateAtom;
 	xev.sequence = 0;
 	xev.window = window->winId();
 	xev.format = 32;
 	xev.data.data32[0] = skip ? 1 : 0;
-	xev.data.data32[1] = *skipTaskbarAtom;
+	xev.data.data32[1] = skipTaskbarAtom;
 	xev.data.data32[2] = 0;
 	xev.data.data32[3] = 0;
 	xev.data.data32[4] = 0;
@@ -92,7 +92,7 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
 	xcb_send_event(
 		connection,
 		false,
-		*root,
+		root,
 		XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT
 			| XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY,
 		reinterpret_cast<const char*>(&xev));
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 4d56f8b4bba52..e14c5543f0822 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 4d56f8b4bba52b46844f46fafa5f9b6b2704429e
+Subproject commit e14c5543f08221d261d8cd015219be5c1062e080
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index e54296fc1d8a8..3ac659ec26349 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit e54296fc1d8a8b1a3d92846ce7d02f3f90b0a32e
+Subproject commit 3ac659ec2634974308254fe7123e31c36ebf662b

From 5810149a77c6ffb95244a6b6fe8fb04b164607ae Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 16 Jun 2024 10:27:00 +0400
Subject: [PATCH 398/400] Improve chats search loading indication.

---
 .../dialogs/dialogs_inner_widget.cpp          | 28 ++++++++++++----
 .../dialogs/dialogs_inner_widget.h            | 14 ++++++--
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 32 ++++++++++++-------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  7 ++--
 4 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index b18471d0e5d97..e10544c6d64eb 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -2588,6 +2588,15 @@ void InnerWidget::dragPinnedFromTouch() {
 	updateReorderPinned(now);
 }
 
+void InnerWidget::searchRequested(bool loading) {
+	_searchWaiting = false;
+	_searchLoading = loading;
+	if (loading) {
+		clearSearchResults(true);
+	}
+	refresh(true);
+}
+
 void InnerWidget::applySearchState(SearchState state) {
 	if (_searchState == state) {
 		return;
@@ -2700,9 +2709,13 @@ void InnerWidget::applySearchState(SearchState state) {
 		clearMouseSelection(true);
 	}
 	if (_state != WidgetState::Default) {
-		_searchLoading = true;
-		_searchMessages.fire({});
-		refresh(true);
+		_searchWaiting = true;
+		_searchRequests.fire(otherChanged
+			? SearchRequestDelay::Instant
+			: SearchRequestDelay::Delayed);
+		if (_searchWaiting) {
+			refresh(true);
+		}
 	}
 }
 
@@ -2918,8 +2931,8 @@ rpl::producer<Ui::ScrollToRequest> InnerWidget::dialogMoved() const {
 	return _dialogMoved.events();
 }
 
-rpl::producer<> InnerWidget::searchMessages() const {
-	return _searchMessages.events();
+rpl::producer<SearchRequestDelay> InnerWidget::searchRequests() const {
+	return _searchRequests.events();
 }
 
 rpl::producer<QString> InnerWidget::completeHashtagRequests() const {
@@ -3007,6 +3020,7 @@ void InnerWidget::searchReceived(
 		HistoryItem *inject,
 		SearchRequestType type,
 		int fullCount) {
+	_searchWaiting = false;
 	_searchLoading = false;
 
 	const auto uniquePeers = uniqueSearchResults();
@@ -3171,7 +3185,7 @@ void InnerWidget::refreshEmpty() {
 			&& _searchResults.empty()
 			&& _peerSearchResults.empty()
 			&& _hashtagResults.empty();
-		if (_searchLoading || !empty) {
+		if (_searchLoading || _searchWaiting || !empty) {
 			if (_searchEmpty) {
 				_searchEmpty->hide();
 			}
@@ -3185,7 +3199,7 @@ void InnerWidget::refreshEmpty() {
 			_searchEmpty->show();
 		}
 
-		if (!_searchLoading || !empty) {
+		if ((!_searchLoading && !_searchWaiting) || !empty) {
 			_loadingAnimation.destroy();
 		} else if (!_loadingAnimation) {
 			_loadingAnimation = Ui::CreateLoadingDialogRowWidget(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index ebb22aa8278ae..3adad0cf42443 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -71,7 +71,7 @@ struct ChosenRow {
 	bool newWindow : 1 = false;
 };
 
-enum class SearchRequestType {
+enum class SearchRequestType : uchar {
 	FromStart,
 	FromOffset,
 	PeerFromStart,
@@ -80,6 +80,12 @@ enum class SearchRequestType {
 	MigratedFromOffset,
 };
 
+enum class SearchRequestDelay : uchar {
+	InCache,
+	Instant,
+	Delayed,
+};
+
 enum class WidgetState {
 	Default,
 	Filtered,
@@ -145,6 +151,7 @@ class InnerWidget final : public Ui::RpWidget {
 	}
 	[[nodiscard]] bool hasFilteredResults() const;
 
+	void searchRequested(bool loading);
 	void applySearchState(SearchState state);
 	[[nodiscard]] auto searchTagsChanges() const
 		-> rpl::producer<std::vector<Data::ReactionId>>;
@@ -168,7 +175,7 @@ class InnerWidget final : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<int> scrollByDeltaRequests() const;
 	[[nodiscard]] rpl::producer<Ui::ScrollToRequest> mustScrollTo() const;
 	[[nodiscard]] rpl::producer<Ui::ScrollToRequest> dialogMoved() const;
-	[[nodiscard]] rpl::producer<> searchMessages() const;
+	[[nodiscard]] rpl::producer<SearchRequestDelay> searchRequests() const;
 	[[nodiscard]] rpl::producer<QString> completeHashtagRequests() const;
 	[[nodiscard]] rpl::producer<> refreshHashtagsRequests() const;
 
@@ -529,7 +536,7 @@ class InnerWidget final : public Ui::RpWidget {
 
 	rpl::event_stream<Ui::ScrollToRequest> _mustScrollTo;
 	rpl::event_stream<Ui::ScrollToRequest> _dialogMoved;
-	rpl::event_stream<> _searchMessages;
+	rpl::event_stream<SearchRequestDelay> _searchRequests;
 	rpl::event_stream<QString> _completeHashtagRequests;
 	rpl::event_stream<> _refreshHashtagsRequests;
 
@@ -547,6 +554,7 @@ class InnerWidget final : public Ui::RpWidget {
 
 	bool _savedSublists = false;
 	bool _searchLoading = false;
+	bool _searchWaiting = false;
 
 	base::unique_qptr<Ui::PopupMenu> _menu;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 068c3081536d5..61689d105dbb5 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -95,6 +95,7 @@ namespace {
 
 constexpr auto kSearchPerPage = 50;
 constexpr auto kStoriesExpandDuration = crl::time(200);
+constexpr auto kSearchRequestDelay = crl::time(900);
 
 base::options::toggle OptionForumHideChatsList({
 	.id = kOptionForumHideChatsList,
@@ -324,9 +325,9 @@ Widget::Widget(
 			_scroll->scrollToY(st + _inner->st()->height);
 		}
 	}, lifetime());
-	_inner->searchMessages(
-	) | rpl::start_with_next([=] {
-		searchRequested();
+	_inner->searchRequests(
+	) | rpl::start_with_next([=](SearchRequestDelay delay) {
+		searchRequested(delay);
 	}, lifetime());
 	_inner->completeHashtagRequests(
 	) | rpl::start_with_next([=](const QString &tag) {
@@ -1921,7 +1922,7 @@ void Widget::loadMoreBlockedByDate() {
 	session().api().requestMoreBlockedByDateDialogs();
 }
 
-bool Widget::search(bool inCache) {
+bool Widget::search(bool inCache, SearchRequestDelay delay) {
 	_processingSearch = true;
 	const auto guard = gsl::finally([&] {
 		_processingSearch = false;
@@ -1950,7 +1951,7 @@ bool Widget::search(bool inCache) {
 		return true;
 	} else if (inCache) {
 		const auto success = _singleMessageSearch.lookup(query, [=] {
-			searchRequested();
+			searchRequested(delay);
 		});
 		if (!success) {
 			return false;
@@ -2068,6 +2069,9 @@ bool Widget::search(bool inCache) {
 			}).send();
 			_searchQueries.emplace(_searchRequest, _searchQuery);
 		}
+		_inner->searchRequested(true);
+	} else {
+		_inner->searchRequested(false);
 	}
 	const auto peerQuery = Api::ConvertPeerSearchQuery(query);
 	if (searchForPeersRequired(peerQuery)) {
@@ -2130,9 +2134,14 @@ bool Widget::searchForTopicsRequired(const QString &query) const {
 		&& !_openedForum->topicsList()->loaded();
 }
 
-void Widget::searchRequested() {
-	if (!search(true)) {
-		_searchTimer.callOnce(AutoSearchTimeout);
+void Widget::searchRequested(SearchRequestDelay delay) {
+	if (search(true, delay)) {
+		return;
+	} else if (delay == SearchRequestDelay::Instant) {
+		_searchTimer.cancel();
+		search();
+	} else {
+		_searchTimer.callOnce(kSearchRequestDelay);
 	}
 }
 
@@ -2187,10 +2196,11 @@ void Widget::searchTopics() {
 }
 
 void Widget::searchMore() {
-	if (_searchRequest || _searchInHistoryRequest) {
+	if (_searchRequest
+		|| _searchInHistoryRequest
+		|| _searchTimer.isActive()) {
 		return;
-	}
-	if (!_searchFull) {
+	} else if (!_searchFull) {
 		if (const auto peer = searchInPeer()) {
 			auto &histories = session().data().histories();
 			const auto topic = searchInTopic();
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 581bfdc002abc..46e5b55e0ffff 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -74,7 +74,8 @@ class FakeRow;
 class Key;
 struct ChosenRow;
 class InnerWidget;
-enum class SearchRequestType;
+enum class SearchRequestType : uchar;
+enum class SearchRequestDelay : uchar;
 class Suggestions;
 class ChatSearchIn;
 enum class ChatSearchTab : uchar;
@@ -156,8 +157,8 @@ class Widget final : public Window::AbstractSectionWidget {
 	[[nodiscard]] QString currentSearchQuery() const;
 	[[nodiscard]] int currentSearchQueryCursorPosition() const;
 	void clearSearchField();
-	void searchRequested();
-	bool search(bool inCache = false);
+	void searchRequested(SearchRequestDelay delay);
+	bool search(bool inCache = false, SearchRequestDelay after = {});
 	void searchTopics();
 	void searchMore();
 

From 3d114131e0d32fb0efed4f3d0d5069bc3928db5b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 16 Jun 2024 10:27:14 +0400
Subject: [PATCH 399/400] Fix premium gifting recipient choosing.

---
 Telegram/Resources/langs/lang.strings           |  1 +
 Telegram/SourceFiles/boxes/gift_premium_box.cpp | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 7a3c42b060119..7d7ff8f2d3eb0 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -897,6 +897,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_gift_premium_users_confirm" = "Proceed";
 "lng_settings_gift_premium_users_error#one" = "You can select maximum {count} user.";
 "lng_settings_gift_premium_users_error#other" = "You can select maximum {count} users.";
+"lng_settings_gift_premium_choose" = "Please choose at least one recipient.";
 
 "lng_backgrounds_header" = "Choose Wallpaper";
 "lng_theme_sure_keep" = "Keep this theme?";
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index ef87c642369b6..251b94b7551ff 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -1011,14 +1011,16 @@ void GiftPremiumValidator::showChoosePeerBox(const QString &ref) {
 				}) | ranges::views::filter([](UserData *u) -> bool {
 					return u;
 				}) | ranges::to<std::vector<not_null<UserData*>>>();
-				if (!users.empty()) {
-					const auto giftBox = show->show(
-						Box(GiftsBox, _controller, users, api, ref));
-					giftBox->boxClosing(
-					) | rpl::start_with_next([=] {
-						_manyGiftsLifetime.destroy();
-					}, giftBox->lifetime());
+				if (users.empty()) {
+					show->showToast(
+						tr::lng_settings_gift_premium_choose(tr::now));
 				}
+				const auto giftBox = show->show(
+					Box(GiftsBox, _controller, users, api, ref));
+				giftBox->boxClosing(
+				) | rpl::start_with_next([=] {
+					_manyGiftsLifetime.destroy();
+				}, giftBox->lifetime());
 				(*ignoreClose) = true;
 				peersBox->closeBox();
 			};

From 4047f1733decd5edf96d125589f128758b68d922 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 16 Jun 2024 12:16:36 +0400
Subject: [PATCH 400/400] Update submodules

---
 Telegram/ThirdParty/dispatch           | 2 +-
 Telegram/ThirdParty/fcitx5-qt          | 2 +-
 Telegram/ThirdParty/kcoreaddons        | 2 +-
 Telegram/ThirdParty/kimageformats      | 2 +-
 Telegram/ThirdParty/nimf               | 2 +-
 Telegram/ThirdParty/xdg-desktop-portal | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Telegram/ThirdParty/dispatch b/Telegram/ThirdParty/dispatch
index ee39300b12a77..542b7f3231168 160000
--- a/Telegram/ThirdParty/dispatch
+++ b/Telegram/ThirdParty/dispatch
@@ -1 +1 @@
-Subproject commit ee39300b12a77efd3f2f020e009e42d557adbb29
+Subproject commit 542b7f32311680b11b6fc8fcb2576955460ba7da
diff --git a/Telegram/ThirdParty/fcitx5-qt b/Telegram/ThirdParty/fcitx5-qt
index cc77e32c0ab67..c743b12e6780e 160000
--- a/Telegram/ThirdParty/fcitx5-qt
+++ b/Telegram/ThirdParty/fcitx5-qt
@@ -1 +1 @@
-Subproject commit cc77e32c0ab675a663a7c019b3bb8cfcc60c5ec3
+Subproject commit c743b12e6780edf1dcfe9071531c80f050cacb95
diff --git a/Telegram/ThirdParty/kcoreaddons b/Telegram/ThirdParty/kcoreaddons
index 79b99f162b200..fd84da51b554e 160000
--- a/Telegram/ThirdParty/kcoreaddons
+++ b/Telegram/ThirdParty/kcoreaddons
@@ -1 +1 @@
-Subproject commit 79b99f162b200413671dbabe21c73356d9956e35
+Subproject commit fd84da51b554eac25e35b1e3f373edaab3029b15
diff --git a/Telegram/ThirdParty/kimageformats b/Telegram/ThirdParty/kimageformats
index 63a9de758f413..106279d32ec4b 160000
--- a/Telegram/ThirdParty/kimageformats
+++ b/Telegram/ThirdParty/kimageformats
@@ -1 +1 @@
-Subproject commit 63a9de758f4132b73ea4535fd9dd7fde3138dc33
+Subproject commit 106279d32ec4b93ccf5e29a92616e0f0cc8d2382
diff --git a/Telegram/ThirdParty/nimf b/Telegram/ThirdParty/nimf
index 955ee48b4f402..498ec7ffab3ac 160000
--- a/Telegram/ThirdParty/nimf
+++ b/Telegram/ThirdParty/nimf
@@ -1 +1 @@
-Subproject commit 955ee48b4f4020b317ece1e3b1e58c0b7f4bd0f3
+Subproject commit 498ec7ffab3ac140c2469638a14451788f03e798
diff --git a/Telegram/ThirdParty/xdg-desktop-portal b/Telegram/ThirdParty/xdg-desktop-portal
index fa8d41a2f9a5d..11c8a96b147ae 160000
--- a/Telegram/ThirdParty/xdg-desktop-portal
+++ b/Telegram/ThirdParty/xdg-desktop-portal
@@ -1 +1 @@
-Subproject commit fa8d41a2f9a5d30a1e41568b6fb53b046dce14dc
+Subproject commit 11c8a96b147aeae70e3f770313f93b367d53fedd